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

[Bastien Montagne]

Commit: f15741f830644936df33e6c3221766a8ea7c64bc
Author: Bastien Montagne
Date:   Wed Oct 14 17:17:30 2015 +0200
Branches: missing-libs
https://developer.blender.org/rBf15741f830644936df33e6c3221766a8ea7c64bc

Merge branch 'master' into missing-libs

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



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