[Bf-blender-cvs] [227be15] alembic: Merge branch 'master' into alembic

[Bastien Montagne]

Commit: 227be153e95b963e5d46746896a3f797cb41fa4e
Author: Bastien Montagne
Date:   Mon Apr 20 13:58:16 2015 +0200
Branches: alembic
https://developer.blender.org/rB227be153e95b963e5d46746896a3f797cb41fa4e

Merge branch 'master' into alembic

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



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