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

[Bastien Montagne]

Commit: b3cd56103285573f9ce8fd9179c268a11664af21
Author: Bastien Montagne
Date:   Fri Jan 30 13:58:45 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBb3cd56103285573f9ce8fd9179c268a11664af21

Merge branch 'master' into asset-experiments

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



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