From: John Hodge <tpg@mutabah.net>
Date: Sat, 19 Feb 2011 13:37:26 +0000 (+0800)
Subject: Merge branch 'master' of serenade.mutabah.net:opendispense2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=21ed7a19f1f3e046c2985043e7fbe054b65cb4e4;p=tpg%2Fopendispense2.git

Merge branch 'master' of serenade.mutabah.net:opendispense2
---

21ed7a19f1f3e046c2985043e7fbe054b65cb4e4