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

[Sergey Sharybin]

Commit: e5c1f283720e755e0903a9bfb83b734c504ba1e4
Author: Sergey Sharybin
Date:   Fri Jan 16 02:29:32 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBe5c1f283720e755e0903a9bfb83b734c504ba1e4

Merge branch 'master' into gooseberry

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



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