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

[Sergey Sharybin]

Commit: c9c207f093b91c2d72cc053284171108a2cb8aee
Author: Sergey Sharybin
Date:   Mon Apr 20 15:06:26 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBc9c207f093b91c2d72cc053284171108a2cb8aee

Merge branch 'master' into gooseberry

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



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