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
..
2010-01-13 17:28:31 -08:00
2010-01-10 14:04:18 +13:00
2010-02-02 17:00:10 -05:00