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

[Lukas Tönne]

Commit: da2d77a3fc790c191f1ab8dae134aac4baed351d
Author: Lukas Tönne
Date:   Fri Aug 8 12:34:01 2014 +0200
Branches: testbuild
https://developer.blender.org/rBda2d77a3fc790c191f1ab8dae134aac4baed351d

Merge branch 'hair_system_squash' into testbuild

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



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