Craig Andrews 49bce941a9 Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/action.php
	lib/noticeform.php
2009-09-24 17:15:54 -04:00
..
2009-09-03 14:58:50 -04:00
2009-09-15 21:22:15 -04:00
2009-09-03 14:58:50 -04:00
2009-09-21 16:33:15 -04:00
2009-09-23 23:04:25 -04:00
2009-09-03 14:58:50 -04:00
2009-09-03 14:58:50 -04:00