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-17 12:27:14 +01:00

openxadminpanel.php

* onPluginVersion added.

2010-10-23 19:23:25 +02:00

OpenXPlugin.php

make 'admin' a safe user name

2011-01-23 10:18:35 -05:00