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
..
2010-02-25 22:30:04 -05:00
2010-10-29 16:26:45 -07:00
2010-01-13 17:28:31 -08:00
2010-07-28 11:43:47 -04:00
2010-10-25 13:08:57 -07:00