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-02 23:25:34 -05:00
2009-11-12 10:24:18 +00:00
2010-03-04 23:30:36 -05:00
2010-03-08 17:22:23 -05:00