Merge commit 'martins-svart/status-test-2' into status-test
authorMartin Schwenke <martin@meltin.net>
Thu, 26 Nov 2009 05:25:15 +0000 (16:25 +1100)
committerMartin Schwenke <martin@meltin.net>
Thu, 26 Nov 2009 05:25:15 +0000 (16:25 +1100)
1  2 
server/eventscript.c

Simple merge