Craig Andrews 714d920fae Merge branch '0.9.x' into 1.0.x
Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
..
2010-03-04 07:00:45 -08:00
2009-11-18 18:25:36 -08:00
2010-02-25 22:08:25 -08:00
2009-11-04 22:12:01 -08:00
2010-01-24 16:36:04 -08:00
2010-02-05 03:18:43 +00:00
2010-01-24 16:36:05 -08:00
2009-11-15 15:57:52 +01:00
2010-02-16 09:22:02 -08:00
2010-02-24 20:52:45 -05:00
2010-03-04 10:16:59 -08:00
2009-11-18 18:25:36 -08:00
2010-02-16 13:15:09 -05:00
2010-02-16 13:15:09 -05:00
2010-03-04 20:04:44 +01:00
2009-11-19 12:00:25 -05:00
2010-03-04 23:10:27 -05:00
2010-03-01 18:49:39 -05:00
2010-01-26 00:21:05 -05:00
2009-11-21 16:04:20 +01:00
2010-01-10 14:06:52 -08:00
2010-03-08 17:22:23 -05:00
2010-02-20 13:23:08 -05:00
2010-02-11 16:47:47 -05:00
2010-01-27 16:34:18 -05:00
2010-03-08 17:22:23 -05:00