Zach Copley b7d0746694 Merge branch '0.9.x' into 1.0.x ... Conflicts: actions/confirmaddress.php actions/emailsettings.php actions/hostmeta.php actions/imsettings.php actions/login.php actions/profilesettings.php actions/showgroup.php actions/smssettings.php actions/urlsettings.php actions/userauthorization.php actions/userdesignsettings.php classes/Memcached_DataObject.php index.php lib/accountsettingsaction.php lib/action.php lib/common.php lib/connectsettingsaction.php lib/designsettings.php lib/personalgroupnav.php lib/profileaction.php lib/userprofile.php plugins/ClientSideShorten/ClientSideShortenPlugin.php plugins/Facebook/FBConnectSettings.php plugins/Facebook/FacebookPlugin.php plugins/NewMenu/NewMenuPlugin.php plugins/NewMenu/newmenu.css		2011-02-28 15:39:43 -08:00
..
locale	Localisation updates from http://translatewiki.net.	2011-02-14 19:43:16 +01:00
scripts	remove debugging statement and add a bit of output to updatecounts	2010-07-10 09:58:27 -04:00
SitemapPlugin.php	make 'admin' a safe user name	2011-01-23 10:18:35 -05:00
Sitemap_notice_count.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00
Sitemap_user_count.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00
noticesitemap.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00
sitemapaction.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00
sitemapadminpanel.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00
sitemapindex.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00
usersitemap.php	i18n/L10n review, plugin credits added.	2010-10-03 23:54:57 +02:00