Merge 3.5 branches
authorMartin Panter <vadmium>
Wed, 9 Sep 2015 02:51:53 +0000 (02:51 +0000)
committerMartin Panter <vadmium>
Wed, 9 Sep 2015 02:51:53 +0000 (02:51 +0000)
commit5127cdea054eba8d1f7631f050f3a91cc01b6542
treeb028166c637d7cef1f5ca44acf84d5583bbf7713
parent0ff89099c7f1c848c0df3f7f2220b26e08b939da
parent100fc3fbc26eb4e36f3c72e34ccc4e1a8f8b1f95
Merge 3.5 branches