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
..
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2010-10-20 20:01:12 +02:00
2011-01-14 21:53:39 +01:00
2011-02-28 15:39:43 -08:00
2010-12-07 10:50:05 -08:00
2011-02-15 12:26:40 -05:00
2011-02-28 15:39:43 -08:00
2010-12-07 10:50:05 -08:00
2011-01-29 00:33:13 +01:00
2009-11-18 18:25:36 -08:00
2010-09-12 18:34:33 +02:00
2011-01-29 00:33:13 +01:00
2010-09-03 17:50:29 -04:00
2011-01-23 10:18:35 -05:00
2011-02-26 00:34:46 +01:00
2010-06-03 16:09:47 -07:00
2011-01-29 00:33:13 +01:00
2009-11-19 12:00:25 -05:00
2011-02-28 15:39:43 -08:00
2010-03-01 18:49:39 -05:00
2010-10-19 12:23:49 -07:00
2011-02-17 22:36:14 -08:00
2011-02-17 22:36:14 -08:00
2011-02-28 15:39:43 -08:00
2011-01-23 12:35:35 -05:00
2010-01-10 14:06:52 -08:00
2010-12-07 10:50:05 -08:00
2011-01-23 12:35:35 -05:00
2010-02-20 13:23:08 -05:00
2010-11-04 19:16:19 +01:00
2010-10-31 00:58:35 +02:00
2011-02-28 15:39:43 -08:00
2010-12-30 12:15:34 -08:00
2011-01-29 00:33:13 +01:00
2011-01-29 00:33:13 +01:00