[Bf-blender-cvs] [641acee] testbuild: Merge branch 'hair_system_squash' into testbuild

[Lukas Tönne]

Commit: 641aceef9573127f8dcab6f9773b5875beb3c54b
Author: Lukas Tönne
Date:   Fri Aug 8 16:02:50 2014 +0200
Branches: testbuild
https://developer.blender.org/rB641aceef9573127f8dcab6f9773b5875beb3c54b

Merge branch 'hair_system_squash' into testbuild

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



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