[Bf-blender-cvs] [06226b2] alembic: Merge branch 'master' into alembic

[Campbell Barton]

Commit: 06226b28cd6b75a99c3989236bf7a4c54ca694b1
Author: Campbell Barton
Date:   Thu May 7 23:49:36 2015 +1000
Branches: alembic
https://developer.blender.org/rB06226b28cd6b75a99c3989236bf7a4c54ca694b1

Merge branch 'master' into alembic

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



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