[Bf-blender-cvs] [6f23622] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 6f236221c6f36c6f49fd2e49c346f47184bea96d
Author: Bastien Montagne
Date:   Fri Jun 19 12:33:18 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB6f236221c6f36c6f49fd2e49c346f47184bea96d

Merge branch 'master' into asset-experiments

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



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