Merge 2015.2 patches

svn path=/Website/branches/v2015.3/; revision=27651
This commit is contained in:
Jos Groot Lipman
2016-01-07 09:07:17 +00:00
parent dc4e43d978
commit 72ded7f941
2 changed files with 1111 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

File diff suppressed because it is too large Load Diff