[Bf-blender-cvs] [677d790] UI-experiments: Merge branch 'master' into UI-experiments

[Julian Eisel]

Commit: 677d7906abd7a33c7a873d57959ccd38c456f1cf
Author: Julian Eisel
Date:   Thu Jun 4 17:55:03 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB677d7906abd7a33c7a873d57959ccd38c456f1cf

Merge branch 'master' into UI-experiments

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



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