[Bf-blender-cvs] [b47b035] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: b47b035f57da310cefe72b90f50b9c1bc956528f
Author: Bastien Montagne
Date:   Wed Nov 25 15:16:26 2015 +0100
Branches: id-remap
https://developer.blender.org/rBb47b035f57da310cefe72b90f50b9c1bc956528f

Merge branch 'master' into id-remap

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



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