[Bf-blender-cvs] [0e3a953] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 0e3a9530dae1a5299069a810598bedc7d71e8a77
Author: Bastien Montagne
Date:   Mon Apr 13 15:53:37 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB0e3a9530dae1a5299069a810598bedc7d71e8a77

Merge branch 'master' into asset-experiments

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



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