Brion Vibber 696aeea113 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	lib/language.php
	plugins/OpenID/finishaddopenid.php
2010-05-27 14:57:32 -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