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

[Sergey Sharybin]

Commit: e3a0345d8ddda7980bfa232f5b306bcfd6165ce0
Author: Sergey Sharybin
Date:   Fri Apr 17 19:11:42 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBe3a0345d8ddda7980bfa232f5b306bcfd6165ce0

Merge branch 'master' into gooseberry

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



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