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

[Antony Riakiotakis]

Commit: 12cb3a78f21456c94813b32c8986bddeda2870bd
Author: Antony Riakiotakis
Date:   Fri Feb 6 12:57:04 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB12cb3a78f21456c94813b32c8986bddeda2870bd

Merge branch 'master' into gooseberry

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



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