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

[Bastien Montagne]

Commit: 3e6aa7bd0821be80dda748f3340103f899a2c757
Author: Bastien Montagne
Date:   Wed Feb 18 19:30:06 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB3e6aa7bd0821be80dda748f3340103f899a2c757

Merge branch 'master' into asset-experiments

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



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