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-06 10:07:43 -04:00
2010-07-29 13:01:04 +02:00
2010-07-29 13:01:04 +02:00
2010-10-25 13:08:57 -07:00
2010-10-05 11:40:49 -07:00
2010-10-25 11:18:49 -04:00
2010-10-25 13:08:57 -07:00
2010-04-30 15:29:05 -07:00
2010-10-28 16:26:34 -07:00