Brion Vibber 04ca706601 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php
2010-11-02 15:02:10 -07:00
..
2008-09-22 15:58:24 -04:00
2010-03-04 23:30:04 -05:00
2010-03-09 10:55:48 -05:00
2008-09-22 15:58:24 -04:00
2010-07-20 17:34:58 -07:00
2009-09-23 09:20:04 -04:00
2009-11-08 23:28:51 +01:00