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

[Bastien Montagne]

Commit: 0add26e60b5b05632c8a456df935545900b08e37
Author: Bastien Montagne
Date:   Tue Dec 9 17:46:10 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB0add26e60b5b05632c8a456df935545900b08e37

Merge branch 'master' into asset-experiments

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



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