[Bf-blender-cvs] [bbb22f8] soc-2014-shapekey: Merge branch 'master' into soc-2014-shapekey

[Bastien Montagne]

Commit: bbb22f8036680245174c61c350a0735b4074b9a9
Author: Bastien Montagne
Date:   Tue Oct 21 14:10:52 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rBbbb22f8036680245174c61c350a0735b4074b9a9

Merge branch 'master' into soc-2014-shapekey

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



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