Merge commit 'martins/status-test' into status-test-2
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 27 Nov 2009 01:50:45 +0000 (12:50 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 27 Nov 2009 01:50:45 +0000 (12:50 +1100)
1  2 
server/eventscript.c

Simple merge