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

[Bastien Montagne]

Commit: 769de4ff1e8f5b913f0efae34dae105475492af9
Author: Bastien Montagne
Date:   Wed Dec 10 21:16:42 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB769de4ff1e8f5b913f0efae34dae105475492af9

Merge branch 'master' into asset-experiments

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



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