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

[Bastien Montagne]

Commit: 7b05fd5830442043759e0630072aba4e8a561901
Author: Bastien Montagne
Date:   Fri Jan 2 17:24:39 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB7b05fd5830442043759e0630072aba4e8a561901

Merge branch 'master' into asset-experiments

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



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