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

[Bastien Montagne]

Commit: 8ff6e455faac6745d6bdb5c9b578704ce975e004
Author: Bastien Montagne
Date:   Sun Jan 18 18:50:31 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB8ff6e455faac6745d6bdb5c9b578704ce975e004

Merge branch 'master' into asset-experiments

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



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