[Bf-blender-cvs] [5dfb07a] hair_immediate_fixes: Merge branch 'master' into hair_immediate_fixes

[Lukas Tönne]

Commit: 5dfb07ab433a1e803af647158f8726e4fed1f8df
Author: Lukas Tönne
Date:   Wed Sep 24 19:02:58 2014 +0200
Branches: hair_immediate_fixes
https://developer.blender.org/rB5dfb07ab433a1e803af647158f8726e4fed1f8df

Merge branch 'master' into hair_immediate_fixes

Conflicts:
	source/blender/blenkernel/intern/implicit.c

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



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