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

[Bastien Montagne]

Commit: 6771aeeff5007d533a6b63409de98553182832bd
Author: Bastien Montagne
Date:   Sun Mar 1 10:54:02 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB6771aeeff5007d533a6b63409de98553182832bd

Merge branch 'master' into asset-experiments

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



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