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

[Bastien Montagne]

Commit: da7f20e385f16242aaf016d5f565598a8cf65666
Author: Bastien Montagne
Date:   Mon Dec 8 17:37:49 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBda7f20e385f16242aaf016d5f565598a8cf65666

Merge branch 'master' into asset-experiments

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



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