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

[Sergey Sharybin]

Commit: 8793d9dac53bdf9c317f56276a93d74d51917e02
Author: Sergey Sharybin
Date:   Thu Jan 15 22:36:26 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB8793d9dac53bdf9c317f56276a93d74d51917e02

Merge branch 'master' into gooseberry

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



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