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-09-03 17:50:29 -04:00
2010-10-25 13:08:57 -07:00
2010-09-20 20:40:55 +02:00
2010-10-19 15:18:07 -07:00
2010-10-12 16:33:36 -07:00
2010-09-03 17:50:29 -04:00
2010-10-12 16:33:36 -07:00
2010-10-19 15:18:07 -07:00
2010-09-03 17:50:29 -04:00
2010-10-25 13:08:57 -07:00
2010-10-25 13:08:57 -07:00
2010-10-25 13:08:57 -07:00
2010-10-25 13:08:57 -07:00
2010-10-19 15:18:07 -07:00
2010-10-12 16:33:36 -07:00
2010-09-03 17:50:29 -04:00