From: John Hodge <tpg@mutabah.net>
Date: Sun, 10 Apr 2011 09:43:08 +0000 (+0800)
Subject: Added merlo to trusted list and changed default server to merlo
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=4740d52e909da9e8179955043ee2020bedae6a83;hp=4740d52e909da9e8179955043ee2020bedae6a83;p=tpg%2Fopendispense2.git

Added merlo to trusted list and changed default server to merlo
---