[Bf-blender-cvs] [182535b] hair_immediate_fixes: Merge branch 'master' into hair_immediate_fixes

[Lukas Tönne]

Commit: 182535b2966dbe899e0b7bb8446d5e7db87f14b3
Author: Lukas Tönne
Date:   Wed Oct 1 10:06:00 2014 +0200
Branches: hair_immediate_fixes
https://developer.blender.org/rB182535b2966dbe899e0b7bb8446d5e7db87f14b3

Merge branch 'master' into hair_immediate_fixes

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



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