Merge branch 'master' of git.atheme.org:/gitroot/charybdis

This commit is contained in:
William Pitcock 2012-02-21 21:09:49 -06:00
commit 7c0bbdc872

View file

@ -252,8 +252,6 @@ struct LocalUser
* to avoid flooding. * to avoid flooding.
* -- adrian * -- adrian
*/ */
int dummy1;
int dummy0;
int sent_parsed; /* how many messages we've parsed in this second */ int sent_parsed; /* how many messages we've parsed in this second */
time_t last_knock; /* time of last knock */ time_t last_knock; /* time of last knock */
unsigned long random_ping; unsigned long random_ping;