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

[Bastien Montagne]

Commit: ae294763aa294074c0e39ebb4a877d04e790a58c
Author: Bastien Montagne
Date:   Tue Feb 24 20:15:13 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBae294763aa294074c0e39ebb4a877d04e790a58c

Merge branch 'master' into asset-experiments

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



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