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

[Lukas Tönne]

Commit: 4b3cc5a24f788cd89b9f7a91a609a066c19e0cc7
Author: Lukas Tönne
Date:   Wed Sep 24 19:04:14 2014 +0200
Branches: hair_system
https://developer.blender.org/rB4b3cc5a24f788cd89b9f7a91a609a066c19e0cc7

Merge branch 'master' into hair_system_solver

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



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