From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Thu, 17 Mar 2016 00:02:34 +0000 (+0000)
Subject: Merge branch 'master' of ssh://gelforn.xestia.co.uk:/scmrepos/xestiaab
X-Git-Tag: release-0.11~55
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=f27381aed045186f4c84325433310b811cd37b6f;p=xestiaab%2F.git

Merge branch 'master' of ssh://gelforn.xestia.co.uk:/scmrepos/xestiaab

Conflicts:
	source/contacteditor/frmContactEditor-Business.cpp
---

f27381aed045186f4c84325433310b811cd37b6f