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

[Antony Riakiotakis]

Commit: cb6c0663e13674bd129415c037e41e9d5d54ffdd
Author: Antony Riakiotakis
Date:   Fri Jan 30 14:30:57 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBcb6c0663e13674bd129415c037e41e9d5d54ffdd

Merge branch 'master' into gooseberry

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



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