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

[Lukas Tönne]

Commit: 1b3b5a2ec1ac9db5572c7dd75add78251772b740
Author: Lukas Tönne
Date:   Sun Aug 24 11:11:34 2014 +0200
Branches: hair_system
https://developer.blender.org/rB1b3b5a2ec1ac9db5572c7dd75add78251772b740

Merge branch 'master' into hair_system

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



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