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
..
2010-09-03 17:50:29 -04:00
2010-10-28 16:26:34 -07:00
2010-09-20 20:40:55 +02:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-09-03 17:50:29 -04:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-09-03 17:50:29 -04:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-10-28 16:26:34 -07:00
2010-09-03 17:50:29 -04:00