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-18 18:25:36 -08:00
2010-02-16 09:25:09 -08:00
2009-11-04 22:12:01 -08:00
2010-01-24 16:36:04 -08:00
2010-02-05 03:18:43 +00:00
2010-01-24 16:36:05 -08:00
2009-11-15 15:57:52 +01:00
2010-02-16 09:22:02 -08:00
2009-12-12 21:25:21 -05:00
2010-02-08 14:07:31 -08:00
2010-02-16 09:25:09 -08:00
2009-11-18 18:25:36 -08:00
2009-11-26 23:28:16 +01:00
2010-02-16 13:15:09 -05:00
2010-02-16 13:15:09 -05:00
2010-02-16 09:25:09 -08:00
2009-11-19 12:00:25 -05:00
2010-01-10 12:26:24 +01:00
2010-01-10 12:26:24 +01:00
2010-01-26 00:21:05 -05:00
2009-11-21 16:04:20 +01:00
2010-01-10 14:06:52 -08:00
2010-02-16 13:15:09 -05:00
2010-02-11 16:47:47 -05:00
2010-01-27 16:34:18 -05:00
2010-02-16 13:15:09 -05:00