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

[Bastien Montagne]

Commit: 163ad29b58fda99c286c131102eb910555aa0fd9
Author: Bastien Montagne
Date:   Wed Apr 15 12:20:32 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB163ad29b58fda99c286c131102eb910555aa0fd9

Merge branch 'master' into asset-experiments

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



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