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

[Antony Riakiotakis]

Commit: b0c5622a977ae3f9afa33a9b59e5129bf14d4d63
Author: Antony Riakiotakis
Date:   Fri Jan 30 16:03:39 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBb0c5622a977ae3f9afa33a9b59e5129bf14d4d63

Merge branch 'master' into gooseberry

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



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