[Bf-blender-cvs] [9fbec44] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 9fbec4424758a8621359d6247518ff86e851aa4f
Author: Bastien Montagne
Date:   Mon Mar 23 15:25:21 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB9fbec4424758a8621359d6247518ff86e851aa4f

Merge branch 'master' into asset-experiments

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



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