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

[Bastien Montagne]

Commit: b32de3eaffc43ea7afe3bf38a7668f2ca81a3009
Author: Bastien Montagne
Date:   Thu Feb 19 15:30:51 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBb32de3eaffc43ea7afe3bf38a7668f2ca81a3009

Merge branch 'master' into asset-experiments

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



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