Brion Vibber d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
..
2010-03-25 16:35:22 -04:00
2010-03-12 10:07:32 -08:00
2010-03-12 10:07:32 -08:00