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
..
2008-09-22 15:58:24 -04:00
2010-03-04 23:30:04 -05:00
2010-02-16 13:15:09 -05:00
2008-09-22 15:58:24 -04:00
2009-09-23 09:20:04 -04:00
2009-11-08 23:28:51 +01:00