Merge branch 'master' of serenade.mutabah.net:opendispense2
authorJohn Hodge <[email protected]>
Sun, 20 Feb 2011 08:25:26 +0000 (16:25 +0800)
committerJohn Hodge <[email protected]>
Sun, 20 Feb 2011 08:25:26 +0000 (16:25 +0800)
commit39d4f8129c6413d3e41916041d239ea6d3041228
treeb36779196e70a219ef28639f6812ee806d0e8e19
parent0e4ecce1c37a438068edc0839081090fa1be1b09
parent9509d10fe69bf2084adbe3c7714a9b1fa20e8318
Merge branch 'master' of serenade.mutabah.net:opendispense2

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

UCC git Repository :: git.ucc.asn.au