Brion Vibber ca489631db Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
..
2010-02-25 22:30:04 -05:00
2010-01-13 17:28:31 -08:00
2010-07-28 11:43:47 -04:00
2010-10-25 13:08:57 -07:00