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

[Bastien Montagne]

Commit: d893c9f1981d351a42a01d1fdde5548347718259
Author: Bastien Montagne
Date:   Mon Feb 16 14:01:44 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBd893c9f1981d351a42a01d1fdde5548347718259

Merge branch 'master' into asset-experiments

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



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