Merge branch '0.9.x' into 1.0.x
authorZach Copley <zach@status.net>
Mon, 28 Feb 2011 23:39:43 +0000 (15:39 -0800)
committerZach Copley <zach@status.net>
Mon, 28 Feb 2011 23:39:43 +0000 (15:39 -0800)
commitb7d07466943a73e1c009467c8daa6e499810080f
tree95842ead62b631eb2d6f544939f29074dd6eb614
parentbabdc430f93a5efb17db4df0518f690d81f758d7
parent061c8d959ba8351b145a27690d5a4caa477915ca
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
51 files changed:
EVENTS.txt
README
actions/apiaccountupdatedeliverydevice.php
actions/avatarsettings.php
actions/emailsettings.php
actions/getfile.php
actions/grouplogo.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/oauthappssettings.php
actions/oauthconnectionssettings.php
actions/passwordsettings.php
actions/profilesettings.php
actions/register.php
actions/showapplication.php
actions/showgroup.php
actions/shownotice.php
actions/showstream.php
actions/smssettings.php
actions/subscriptions.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
classes/Notice.php
classes/Profile.php
classes/User.php
classes/statusnet.ini
index.php
lib/action.php
lib/apiaction.php
lib/attachmentlist.php
lib/cache.php
lib/default.php
lib/noticeform.php
lib/personalgroupnav.php
lib/queuemanager.php
lib/router.php
lib/userprofile.php
lib/util.php
plugins/FacebookBridge/FacebookBridgePlugin.php
plugins/Mapstraction/MapstractionPlugin.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/OpenID/OpenIDPlugin.php
plugins/SubMirror/actions/mirrorsettings.php
plugins/TwitterBridge/TwitterBridgePlugin.php
plugins/UserFlag/UserFlagPlugin.php
theme/base/css/display.css
theme/shiny/css/display.css