[Bf-blender-cvs] [cb530ad] asset-experiments: Merge branch 'asset-engine' into asset-experiments

[Bastien Montagne]

Commit: cb530ad07ed00dbd63af49b214184d34d65d108b
Author: Bastien Montagne
Date:   Fri May 6 13:34:15 2016 +0200
Branches: asset-experiments
https://developer.blender.org/rBcb530ad07ed00dbd63af49b214184d34d65d108b

Merge branch 'asset-engine' into asset-experiments

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



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