[Bf-blender-cvs] [e4b1b17] gooseberry: Merge branch 'master' into gooseberry

[Julian Eisel]

Commit: e4b1b17925be2ba6e928d487b2537e43625aa8a5
Author: Julian Eisel
Date:   Sat Apr 25 14:07:18 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBe4b1b17925be2ba6e928d487b2537e43625aa8a5

Merge branch 'master' into gooseberry

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



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