2 Commits

Author	SHA1	Message	Date
Brion Vibber	59119482ca	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x ... Conflicts: actions/hostmeta.php actions/imsettings.php classes/User.php lib/adminpanelaction.php lib/channel.php lib/default.php lib/router.php lib/util.php	2010-10-04 12:54:36 -07:00
Craig Andrews	8d54809c35	move xrd and hostmeta out of the OStatus plugin and into core ... add event for setting up hostmeta, and use them in the OStatus plugin	2010-09-07 13:45:52 -04:00