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

[Bastien Montagne]

Commit: de3fd8a45c8d364cc8a1f8f0aa4c2004e14c8762
Author: Bastien Montagne
Date:   Thu Jan 15 16:23:19 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBde3fd8a45c8d364cc8a1f8f0aa4c2004e14c8762

Merge branch 'master' into asset-experiments

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



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