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
..
actions	Merge branch '0.9.x' into 1.0.x	2011-02-28 15:39:43 -08:00
classes	* i18n/L10n updates	2010-09-18 22:31:41 +02:00
lib	Merge branch 'master' into 0.9.x	2010-09-21 12:48:16 -07:00
locale	Localisation updates from http://translatewiki.net.	2011-02-14 19:43:16 +01:00
SubMirrorPlugin.php	SubMirror: add mirrored feeds count & management link to stats section when showing your own profile sidebar.	2011-01-18 13:35:36 -08:00