Merge branch 'master' into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Dec 2013 17:14:46 +0000 (23:14 +0600)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 23 Dec 2013 17:14:46 +0000 (23:14 +0600)

Trivial merge