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

[Sergey Sharybin]

Commit: 47618d0393d9b96d3da3900f6f22b39ade3d9b24
Author: Sergey Sharybin
Date:   Thu Jan 22 00:53:29 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB47618d0393d9b96d3da3900f6f22b39ade3d9b24

Merge branch 'master' into gooseberry

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



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