James Booth 91c17f914c Merge branch 'master' into plugins ... Conflicts: src/xmpp/connection.c		2015-04-19 17:32:04 +01:00
..
server_events.c	Merge branch 'master' into plugins	2015-04-19 17:32:04 +01:00
server_events.h	Renamed server event functions	2015-04-19 17:29:54 +01:00