Craig Andrews 057ec1fcea Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
..
2009-03-07 12:55:09 -08:00
2010-01-24 16:36:05 -08:00
2010-02-02 17:00:10 -05:00
2010-02-02 17:00:10 -05:00