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

[Lukas Tönne]

Commit: 3f4be7b9c34f0622d375b2b7e6e29c2c85bfb737
Author: Lukas Tönne
Date:   Tue Jul 29 18:42:17 2014 +0200
Branches: hair_system
https://developer.blender.org/rB3f4be7b9c34f0622d375b2b7e6e29c2c85bfb737

Merge branch 'master' into hair_system

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



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