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

[Lukas Tönne]

Commit: 821d924edf0de45e11f3d4cfca4b2f2014a1be20
Author: Lukas Tönne
Date:   Sun Aug 17 13:27:50 2014 +0200
Branches: hair_system
https://developer.blender.org/rB821d924edf0de45e11f3d4cfca4b2f2014a1be20

Merge branch 'master' into hair_system

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



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