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

[Bastien Montagne]

Commit: f92e64f207cdbcb4c35710b03379fd35450a538c
Author: Bastien Montagne
Date:   Sat Dec 6 18:12:09 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBf92e64f207cdbcb4c35710b03379fd35450a538c

Merge branch 'master' into asset-experiments

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



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