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

[Bastien Montagne]

Commit: b3c8192715471952a195d6ccfef0647881eba0c6
Author: Bastien Montagne
Date:   Thu Apr 16 10:45:24 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBb3c8192715471952a195d6ccfef0647881eba0c6

Merge branch 'master' into asset-experiments

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



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