Message10642

Author	zyasoft
Recipients	tomluk, zyasoft
Date	2016-01-13.18:52:48
SpamBayes Score	-1.0
Marked as misclassified	Yes
Message-id	<1452711169.15.0.226212263815.issue2445@psf.upfronthosting.co.za>
In-reply-to

Content
Not related to the recently fixed #2391 Tomas, right, it's just part of the overall merge mechanism, and what appears to be overeager conflict detection when none actually exists.

History
Date	User	Action	Args
2016-01-13 18:52:49	zyasoft	set	messageid: <1452711169.15.0.226212263815.issue2445@psf.upfronthosting.co.za>
2016-01-13 18:52:49	zyasoft	set	recipients: + zyasoft, tomluk
2016-01-13 18:52:49	zyasoft	link	issue2445 messages
2016-01-13 18:52:48	zyasoft	create