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-02-25 22:30:04 -05:00
2010-01-13 17:28:31 -08:00
2010-01-10 14:04:18 +13:00
2010-03-08 17:22:23 -05:00