[Bf-blender-cvs] [0baa146] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 0baa1469d08903de5414f2833d9b2bcf1901c377
Author: Bastien Montagne
Date:   Tue Aug 11 12:01:12 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB0baa1469d08903de5414f2833d9b2bcf1901c377

Merge branch 'master' into asset-experiments

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



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