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

[Bastien Montagne]

Commit: 33fb541e329cd48932be3377f0cc6793e850e0f6
Author: Bastien Montagne
Date:   Tue Oct 21 12:13:32 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rB33fb541e329cd48932be3377f0cc6793e850e0f6

Merge branch 'master' into soc-2014-shapekey

Conflicts:
	source/blender/blenkernel/BKE_key.h
	source/blender/blenkernel/intern/key.c

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



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