[Bf-blender-cvs] [4a3e22a] gooseberry: Merge branch 'alembic' into gooseberry

[Lukas Tönne]

Commit: 4a3e22a34ce09fbc35c275a1934e4b56d8e96239
Author: Lukas Tönne
Date:   Tue Apr 14 12:34:05 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB4a3e22a34ce09fbc35c275a1934e4b56d8e96239

Merge branch 'alembic' into gooseberry

Conflicts:
	source/blenderplayer/bad_level_call_stubs/stubs.c

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



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