From: John Hodge <tpg@heathred.ucc.gu.uwa.edu.au>
Date: Sun, 20 Feb 2011 01:46:42 +0000 (+0800)
Subject: Merge branch 'master' of git://mutabah.net/opendispense2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=792c0789eecbad303f8b65da8513d5c01bdc648e;p=tpg%2Fopendispense2.git

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

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

792c0789eecbad303f8b65da8513d5c01bdc648e
diff --cc src/server/server.c
index 9691b69,dbb08cb..4c686d9
--- a/src/server/server.c
+++ b/src/server/server.c
@@@ -304,9 -302,8 +303,9 @@@ void Server_ParseClientCommand(tClient 
  	
  	if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) )
  	{
 +		printf("command=%s, args=%s\n", command, args);
  		// Is this an error? (just ignore for now)
- 		args = "";
+ 		//args = "";
  	}