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

[Bastien Montagne]

Commit: cf89c7aa28c36cb566b1c4d5ed40d1baf28e609d
Author: Bastien Montagne
Date:   Tue Feb 24 12:48:23 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBcf89c7aa28c36cb566b1c4d5ed40d1baf28e609d

Merge branch 'master' into asset-experiments

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



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