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

[Lukas Tönne]

Commit: 303d466bd910018db0673c5dd43b048d8e06afc4
Author: Lukas Tönne
Date:   Tue Aug 12 14:37:11 2014 +0200
Branches: hair_system
https://developer.blender.org/rB303d466bd910018db0673c5dd43b048d8e06afc4

Merge branch 'master' into hair_system

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



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