[Bf-blender-cvs] [aee44d5] missing-libs: Merge branch 'master' into missing-libs

[Bastien Montagne]

Commit: aee44d50709282f0cca70c8cee74ba2ea38a5b0d
Author: Bastien Montagne
Date:   Fri Jul 17 21:13:03 2015 +0200
Branches: missing-libs
https://developer.blender.org/rBaee44d50709282f0cca70c8cee74ba2ea38a5b0d

Merge branch 'master' into missing-libs

===================================================================



===================================================================