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
..
2009-12-28 10:42:55 -08:00
2009-10-12 16:36:00 -07:00
2009-10-12 16:36:00 -07:00
2009-12-28 10:42:55 -08:00
2009-10-29 13:24:06 +01:00
2010-01-10 12:26:24 +01:00
2010-02-26 11:35:55 +01:00
2009-12-20 20:20:35 +01:00
2009-11-19 12:00:25 -05:00
2010-01-10 12:26:24 +01:00
2010-02-25 18:39:55 -05:00
2009-11-09 20:01:46 +01:00
2010-02-25 12:05:22 -05:00
2010-01-10 12:26:24 +01:00
2010-03-03 12:10:21 -08:00
2010-03-04 23:30:04 -05:00
2009-11-28 20:52:46 +01:00
2009-11-16 16:08:06 +01:00
2010-02-16 10:25:57 -05:00
2009-11-16 16:08:06 +01:00
2010-01-10 12:26:24 +01:00
2010-01-10 12:26:24 +01:00
2010-03-05 16:20:33 -08:00
2010-02-25 22:08:25 -08:00
2009-11-16 16:08:06 +01:00
2009-11-16 16:08:06 +01:00
2010-01-14 23:40:11 +01:00