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

[Bastien Montagne]

Commit: d41e1c00e659029e54663bab6f1f38e36ddd82e3
Author: Bastien Montagne
Date:   Tue Jan 27 12:02:40 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBd41e1c00e659029e54663bab6f1f38e36ddd82e3

Merge branch 'master' into asset-experiments

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



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