Brion Vibber 9df856e667 Merge branch '0.9.x' into merge
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
..
2008-09-22 15:58:24 -04:00
2010-10-29 15:11:41 -07: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