svn merge ^/trunk/blender -r49917:49919
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2012 11:32:56 +0000 (11:32 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2012 11:32:56 +0000 (11:32 +0000)
commitedf617a3493eb5bd2d90cca82a6f5f585fb034a7
tree8d9e456f77be4c8722165bf9f75a8c2774973dd4
parentf82b93b2c518c8906e1c218099923f1130b88bde
parent60915c90995e2ce12216cc70eb1365de03d3f423
svn merge ^/trunk/blender -r49917:49919