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-02-25 22:30:04 -05:00
2010-01-13 17:28:31 -08:00