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

[Bastien Montagne]

Commit: 6e88990a4bb6a74dc7507db027737419086e99d9
Author: Bastien Montagne
Date:   Thu Sep 24 13:18:51 2015 +0200
Branches: id-remap
https://developer.blender.org/rB6e88990a4bb6a74dc7507db027737419086e99d9

Merge branch 'master' into id-remap

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



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