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

[Bastien Montagne]

Commit: ec071eb76a564310d77242e54462fac1a80683c1
Author: Bastien Montagne
Date:   Sun Feb 15 15:10:34 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBec071eb76a564310d77242e54462fac1a80683c1

Merge branch 'master' into asset-experiments

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



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