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

[Bastien Montagne]

Commit: f13f85676d278f1a6d89a6a548728e6435574b90
Author: Bastien Montagne
Date:   Tue Dec 9 14:15:35 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBf13f85676d278f1a6d89a6a548728e6435574b90

Merge branch 'master' into asset-experiments

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



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