From: Evan Prodromou <evan@status.net>
Date: Tue, 1 Jun 2010 20:56:21 +0000 (-0700)
Subject: Merge branch 'sitemap' of gitorious.org:~evan/statusnet/evans-mainline into sitemap
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ef51cc9ad4a37d6dcd2129828284def1c90d7402;p=quix0rs-gnu-social.git

Merge branch 'sitemap' of gitorious.org:~evan/statusnet/evans-mainline into sitemap

Conflicts:
	plugins/Sitemap/SitemapPlugin.php
	plugins/Sitemap/noticesitemap.php
	plugins/Sitemap/sitemapindex.php
	plugins/Sitemap/usersitemap.php
---

ef51cc9ad4a37d6dcd2129828284def1c90d7402