[Bf-blender-cvs] [e096455] hair_system: Merge branch 'master' into hair_system

[Lukas Tönne]

Commit: e0964553cc9112e58212c2fe9c704fe33786cd16
Author: Lukas Tönne
Date:   Thu Aug 7 23:44:29 2014 +0200
Branches: hair_system
https://developer.blender.org/rBe0964553cc9112e58212c2fe9c704fe33786cd16

Merge branch 'master' into hair_system

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



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