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-10-25 13:08:57 -07:00
2010-10-20 19:34:27 +02:00
2010-10-20 20:01:12 +02:00
2010-10-25 13:08:57 -07:00
2010-05-31 08:49:14 -07:00
2010-05-31 08:49:14 -07:00
2009-11-18 18:25:36 -08:00
2010-11-01 16:49:35 +01:00
2010-09-12 18:34:33 +02:00
2010-09-03 17:50:29 -04:00
2010-06-03 16:09:47 -07:00
2009-11-19 12:00:25 -05:00
2010-08-08 21:13:21 +02:00
2010-11-01 16:49:35 +01:00
2010-03-01 18:49:39 -05:00
2010-01-26 00:21:05 -05:00
2010-10-25 13:08:57 -07:00
2010-01-10 14:06:52 -08:00
2010-10-18 11:12:26 -07:00
2010-02-20 13:23:08 -05:00
2010-10-14 01:35:11 -04:00
2010-10-31 00:58:35 +02:00
2010-10-28 16:26:34 -07:00