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

[Bastien Montagne]

Commit: c0d0b3db660831fb7e7fb5ada055dc47a50abbb3
Author: Bastien Montagne
Date:   Mon Feb 2 12:16:00 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBc0d0b3db660831fb7e7fb5ada055dc47a50abbb3

Merge branch 'master' into asset-experiments

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



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