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-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00
2010-02-16 09:25:09 -08:00
2010-02-16 10:25:57 -05:00
2010-02-16 10:25:57 -05:00