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

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

Conflicts:
	src/server/handler_coke.c
---

39d4f8129c6413d3e41916041d239ea6d3041228