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

[Lukas Tönne]

Commit: f63609f909d6e1936a84f6d5ca5eee9bf46df3e4
Author: Lukas Tönne
Date:   Fri Aug 15 17:49:15 2014 +0200
Branches: testbuild
https://developer.blender.org/rBf63609f909d6e1936a84f6d5ca5eee9bf46df3e4

Merge branch 'hair_system_squash' into testbuild

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



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