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

[Bastien Montagne]

Commit: ac516fddb2fb4b5554ef3016084739e944b7c1ef
Author: Bastien Montagne
Date:   Mon May 25 15:38:14 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rBac516fddb2fb4b5554ef3016084739e944b7c1ef

Merge branch 'master' into asset-experiments

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



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