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

[Bastien Montagne]

Commit: 07136e6176f4b77eedeccc154f38b0ce10957e8a
Author: Bastien Montagne
Date:   Thu Sep 10 22:47:25 2015 +0200
Branches: id-remap
https://developer.blender.org/rB07136e6176f4b77eedeccc154f38b0ce10957e8a

Merge branch 'master' into id-remap

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



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