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

[Bastien Montagne]

Commit: 399b2927df9fc65979d3cfcc40cd027e94a1a056
Author: Bastien Montagne
Date:   Wed Apr 15 19:18:57 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB399b2927df9fc65979d3cfcc40cd027e94a1a056

Merge branch 'master' into asset-experiments

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



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