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
..
2010-01-08 00:38:20 -08:00
2010-01-08 00:38:20 -08:00
2009-11-12 10:24:18 +00:00
2010-02-16 10:18:23 -05:00
2010-01-07 17:37:44 -08:00