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

[Lukas Tönne]

Commit: faaedb1b40855b988b2a1383f3beccccb2af195b
Author: Lukas Tönne
Date:   Wed Oct 1 10:09:22 2014 +0200
Branches: hair_system
https://developer.blender.org/rBfaaedb1b40855b988b2a1383f3beccccb2af195b

Merge branch 'master' into hair_system_solver

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



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