Blender Git Commit Log

Merge branch 'master' into soc-2014-shapekey

Conflicts:
release/datafiles/blender_icons.svg
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_shapekey.c

Note about blender_icons.svg: blindly reset to master state, hard to do otherwise on such file... :/