[Bf-blender-cvs] [90b3832] gooseberry: Merge branch 'alembic' into gooseberry

[Sergey Sharybin]

Commit: 90b3832c4dcc561b1995e3d2a9772af1960eaf54
Author: Sergey Sharybin
Date:   Wed Apr 29 14:48:37 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB90b3832c4dcc561b1995e3d2a9772af1960eaf54

Merge branch 'alembic' into gooseberry

Conflicts:
	intern/cycles/blender/blender_sync.h

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



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