[Bf-blender-cvs] [728b6ed] hair_system: Merge branch 'master' into mesh_samples

[Lukas Tönne]

Commit: 728b6ed8e65f315894e19dcf8fa650611090496f
Author: Lukas Tönne
Date:   Wed Sep 24 15:54:21 2014 +0200
Branches: hair_system
https://developer.blender.org/rB728b6ed8e65f315894e19dcf8fa650611090496f

Merge branch 'master' into mesh_samples

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



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