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

[Lukas Tönne]

Commit: a6f5c4ead717f23c21465137fa794c19cedafd47
Author: Lukas Tönne
Date:   Thu Jul 31 12:34:47 2014 +0200
Branches: hair_system
https://developer.blender.org/rBa6f5c4ead717f23c21465137fa794c19cedafd47

Merge branch 'master' into hair_system

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



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