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

[Sergey Sharybin]

Commit: 258c2286cd7d57c318479947524628a6a7a34506
Author: Sergey Sharybin
Date:   Tue Feb 10 13:19:17 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB258c2286cd7d57c318479947524628a6a7a34506

Merge branch 'master' into gooseberry

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



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