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-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00