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
..
2008-09-22 15:58:24 -04:00
2010-01-27 22:07:04 -05:00
2008-09-22 15:58:24 -04:00
2009-11-08 23:28:51 +01:00
2009-09-23 09:20:04 -04:00
2009-11-08 23:28:51 +01:00