[Bf-blender-cvs] [e2c5839] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Antony Riakiotakis]

Commit: e2c5839114d7305fe873e5004a91c4147f1c6280
Author: Antony Riakiotakis
Date:   Wed Oct 8 12:31:05 2014 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBe2c5839114d7305fe873e5004a91c4147f1c6280

Merge branch 'master' into wiggly-widgets

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



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