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

[Bastien Montagne]

Commit: 4c486c075e63a17288487c6dca8f2e4691ed42e1
Author: Bastien Montagne
Date:   Thu Sep 24 13:14:48 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB4c486c075e63a17288487c6dca8f2e4691ed42e1

Merge branch 'master' into missing-libs

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



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