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

[Bastien Montagne]

Commit: 71a061bc1a6ec273858a720b28d3105ba61b29c8
Author: Bastien Montagne
Date:   Sat May 9 14:29:46 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB71a061bc1a6ec273858a720b28d3105ba61b29c8

Merge branch 'master' into asset-experiments

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



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