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

[Bastien Montagne]

Commit: d0187bf6244ba214bfe2c0c9b93295e82e8e1f62
Author: Bastien Montagne
Date:   Thu Dec 18 19:38:29 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBd0187bf6244ba214bfe2c0c9b93295e82e8e1f62

Merge branch 'master' into asset-experiments

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



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