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

[Lukas Tönne]

Commit: 2b415683fdc4d23c6e6fa6ac812d9d339d964dc3
Author: Lukas Tönne
Date:   Wed May 6 18:58:32 2015 +0200
Branches: alembic
https://developer.blender.org/rB2b415683fdc4d23c6e6fa6ac812d9d339d964dc3

Merge branch 'master' into alembic

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



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