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

[Bastien Montagne]

Commit: f7f71bb1526a473f8da12e430bbeb9e5b901cfcb
Author: Bastien Montagne
Date:   Mon Feb 23 16:13:26 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBf7f71bb1526a473f8da12e430bbeb9e5b901cfcb

Merge branch 'master' into asset-experiments

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



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