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

[Bastien Montagne]

Commit: 47ce2c5574eca221f56420c82d34933d48be0cd5
Author: Bastien Montagne
Date:   Fri Mar 13 14:45:08 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB47ce2c5574eca221f56420c82d34933d48be0cd5

Merge branch 'master' into asset-experiments

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



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