Commit ef51cc9a authored by Evan Prodromou's avatar Evan Prodromou

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
parents 1066b264 5a9ff7c5
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment