[Bf-blender-cvs] [60cd118] gooseberry: Merge branch 'alembic' into gooseberry

[Lukas Tönne]

Commit: 60cd118a462f2b2f7f0c4f6bbe73d3ae6be6b6df
Author: Lukas Tönne
Date:   Tue May 19 14:55:20 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB60cd118a462f2b2f7f0c4f6bbe73d3ae6be6b6df

Merge branch 'alembic' into gooseberry

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

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



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