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-01-29 23:10:15 +01:00
SamplePlugin.php	Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema	2010-10-19 17:25:56 -07:00
User_greeting_count.php	* L10n updates and translator documentation added.	2010-09-18 15:23:17 +02:00
hello.php	* update L10n	2010-09-18 15:26:48 +02:00