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

Conflicts:
	src/server/server.c

diff --cc src/server/server.c
index 9691b69,dbb08cb..4c686d9
--- 1/src/server/server.c
--- 2/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 = "";
        }