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

[Bastien Montagne]

Commit: 47e73e6b72790becc35b2d590fbf74a10e548523
Author: Bastien Montagne
Date:   Mon Aug 10 17:47:00 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB47e73e6b72790becc35b2d590fbf74a10e548523

Merge branch 'master' into asset-experiments

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



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