[Bf-blender-cvs] [20fc027] hair_immediate_fixes hair_system: Merge branch 'master' into hair_immediate_fixes

[Lukas Tönne]

Commit: 20fc02769029c9a4ad97a873424c15367adf5500
Author: Lukas Tönne
Date:   Tue Oct 14 12:54:12 2014 +0200
Branches: hair_immediate_fixes hair_system
https://developer.blender.org/rB20fc02769029c9a4ad97a873424c15367adf5500

Merge branch 'master' into hair_immediate_fixes

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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