svn merge ^/trunk/blender -r48729:48739
authorCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jul 2012 18:21:51 +0000 (18:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jul 2012 18:21:51 +0000 (18:21 +0000)
commitcb72095090217a40131a4481927290d6e6c49222
treeff57b05c13b20251f47276c8211fa026b0e02d60
parent37e73082ab2c4c931f732c5b8f85df9bc13e51ee
parent2580575658c17538baf2770ef823cf21c7ec1710
svn merge ^/trunk/blender -r48729:48739