[Bf-blender-cvs] [e31f57d] temp_localview_split: Merge branch 'master' into temp_localview_split

[Julian Eisel]

Commit: e31f57d217faf0774f69dfbbe07a6c88cc44fb89
Author: Julian Eisel
Date:   Sun Aug 7 21:28:28 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rBe31f57d217faf0774f69dfbbe07a6c88cc44fb89

Merge branch 'master' into temp_localview_split

Conflicts:
	source/blender/editors/object/object_relations.c

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



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