[Bf-blender-cvs] [2e70a29] alembic: Merge branch 'master' into alembic

[Lukas Tönne]

Commit: 2e70a29f9e7fc0a0764a861ff10863940d1b1b2e
Author: Lukas Tönne
Date:   Tue May 26 09:34:31 2015 +0200
Branches: alembic
https://developer.blender.org/rB2e70a29f9e7fc0a0764a861ff10863940d1b1b2e

Merge branch 'master' into alembic

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



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