Brion Vibber 173778eab1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05 17:11:23 -07:00
..
2010-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00
2010-04-29 15:14:51 -07:00
2010-04-30 15:29:05 -07:00
2010-04-30 15:29:05 -07:00