Brion Vibber 1eeb23e1e3 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	actions/confirmaddress.php
2010-04-10 17:56:11 -07:00
..
2010-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00
2010-04-11 01:08:51 +02:00