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

[Bastien Montagne]

Commit: d211c588567d773102282813923eb4702af42458
Author: Bastien Montagne
Date:   Thu Dec 11 17:49:47 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBd211c588567d773102282813923eb4702af42458

Merge branch 'master' into asset-experiments

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



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