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

[Bastien Montagne]

Commit: 50d25aa3957cf87b58c0b64fc6510565a04f35b7
Author: Bastien Montagne
Date:   Sun Jan 25 12:43:36 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB50d25aa3957cf87b58c0b64fc6510565a04f35b7

Merge branch 'master' into asset-experiments

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



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