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

[Lukas Tönne]

Commit: bc4347a73ca361a935f4073f9255495103d1acd8
Author: Lukas Tönne
Date:   Thu Apr 23 16:09:34 2015 +0200
Branches: alembic
https://developer.blender.org/rBbc4347a73ca361a935f4073f9255495103d1acd8

Merge branch 'master' into alembic

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



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