Craig Andrews 20d6a7caed Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
	lib/xmppmanager.php
	plugins/Xmpp/Fake_XMPP.php
	scripts/imdaemon.php
2010-02-16 13:15:09 -05:00
..
2009-11-09 20:01:46 +01:00
2009-12-28 10:42:55 -08:00
2010-01-10 12:26:24 +01:00
2009-10-12 16:36:00 -07:00
2009-10-12 16:36:00 -07:00
2009-12-28 10:42:55 -08:00
2009-10-29 13:24:06 +01:00
2010-01-10 12:26:24 +01:00
2009-11-16 17:04:40 +01:00
2010-01-10 12:26:24 +01:00
2009-12-20 20:20:35 +01:00
2009-11-19 12:00:25 -05:00
2009-09-30 13:59:18 -04:00
2010-01-10 12:26:24 +01:00
2009-11-09 20:01:46 +01:00
2010-01-10 12:26:24 +01:00
2009-11-28 20:52:46 +01:00
2009-11-16 16:08:06 +01:00
2010-02-16 10:25:57 -05:00
2009-11-16 16:08:06 +01:00
2010-01-10 12:26:24 +01:00
2009-11-09 20:01:46 +01:00
2010-01-10 12:26:24 +01:00
2009-11-16 16:08:06 +01:00
2009-11-16 16:08:06 +01:00
2010-01-14 23:40:11 +01:00