From: John Hodge <tpg@heathred.ucc.gu.uwa.edu.au>
Date: Sat, 19 Feb 2011 08:48:59 +0000 (+0800)
Subject: Merge branch 'master' of git://mutabah.net/opendispense2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=065ff12a0d92bc541f005d8a1b03b560dea28873;p=tpg%2Fopendispense2.git

Merge branch 'master' of git://mutabah.net/opendispense2
---

065ff12a0d92bc541f005d8a1b03b560dea28873