Merge branch 'master' of git://mutabah.net/opendispense2
authorJohn Hodge <[email protected]>
Sun, 20 Feb 2011 01:46:42 +0000 (09:46 +0800)
committerJohn Hodge <[email protected]>
Sun, 20 Feb 2011 01:46:42 +0000 (09:46 +0800)
commit792c0789eecbad303f8b65da8513d5c01bdc648e
tree15d7a5453ab691a7a5d0c2367e666526661fe0a3
parentf8d49ca9dfebf179382b1ddc3a47d503d719be11
parent2b718e476dbff288ddf4e948024bcb6c92cc3281
Merge branch 'master' of git://mutabah.net/opendispense2

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

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