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-12 17:08:49 +02:00
2010-09-12 17:08:49 +02:00
2010-09-12 17:08:49 +02:00
2010-09-12 17:08:49 +02:00
2010-09-12 17:08:49 +02:00
2010-09-12 17:08:49 +02:00
2010-10-20 19:34:27 +02:00
2009-10-12 16:36:00 -07:00
2009-10-12 16:36:00 -07:00
2010-05-21 13:15:08 -07:00
2010-03-10 22:27:28 +00:00
2010-10-21 13:20:21 +02:00
2010-07-19 21:09:09 -05:00
2009-12-20 20:20:35 +01:00
2010-09-06 10:07:43 -04:00
2010-01-10 12:26:24 +01:00
2010-02-25 18:39:55 -05:00
2010-10-08 11:47:50 -07:00
2009-11-09 20:01:46 +01:00
2010-10-21 13:20:21 +02:00
2010-10-21 13:20:21 +02:00
2010-10-21 13:20:21 +02:00
2010-10-20 00:49:12 +02:00
2010-03-08 18:06:21 -05:00
2010-10-20 20:29:59 +02:00
2010-10-25 13:08:57 -07:00
2010-10-18 12:17:11 -07:00
2010-10-25 13:08:57 -07:00
2010-04-11 23:24:38 +02:00
2010-04-11 01:03:06 +02:00
2010-01-10 12:26:24 +01:00
2010-03-05 16:23:28 -08:00