[Bf-blender-cvs] [87aaa8e] gooseberry: Merge branch 'alembic' into gooseberry

[Lukas Tönne]

Commit: 87aaa8ecfb998150cbf28df6e63c46fa8b348942
Author: Lukas Tönne
Date:   Thu May 7 17:02:36 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB87aaa8ecfb998150cbf28df6e63c46fa8b348942

Merge branch 'alembic' into gooseberry

Conflicts:
	source/blender/physics/intern/implicit_blender.c

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



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