[Bf-blender-cvs] [1d46359] UI-experiments: Merge branch 'master' into UI-experiments

[Julian Eisel]

Commit: 1d463591aaa1421d075e1ebeca426b68051f35b3
Author: Julian Eisel
Date:   Fri May 29 15:07:00 2015 +0200
Branches: UI-experiments
https://developer.blender.org/rB1d463591aaa1421d075e1ebeca426b68051f35b3

Merge branch 'master' into UI-experiments

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



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