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
..
2010-09-07 13:45:52 -04:00
2011-02-28 15:39:43 -08:00
2010-09-03 17:50:29 -04:00
2011-01-29 23:10:15 +01:00
2011-02-14 19:43:16 +01:00
2010-10-28 00:14:45 +00:00
2011-02-03 11:16:30 -05:00
2011-01-29 23:10:15 +01:00
2011-02-14 19:43:16 +01:00
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2011-02-03 10:46:56 -05:00
2011-01-29 23:10:15 +01:00
2011-02-14 19:43:16 +01:00
2011-01-29 23:10:15 +01:00
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-02-03 11:20:57 -05:00
2011-01-29 23:10:15 +01:00
2011-02-14 19:43:16 +01:00
2011-01-29 23:10:15 +01:00
2011-02-17 12:27:14 +01:00
2011-02-18 13:49:29 -05:00
2010-09-20 20:40:55 +02:00
2011-02-03 17:15:12 -08:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-02-28 15:39:43 -08:00
2011-02-03 01:31:31 +01:00
2011-02-26 00:34:44 +01:00
2011-02-28 15:39:43 -08:00
2011-02-14 19:43:16 +01:00
2011-02-26 00:34:44 +01:00
2010-09-03 17:50:29 -04:00
2011-02-14 19:43:16 +01:00
2011-02-14 19:43:16 +01:00
2010-12-17 17:13:21 -08:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-02-26 00:34:44 +01:00
2011-02-26 00:34:44 +01:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-02-03 10:51:59 -05:00
2011-02-28 15:39:43 -08:00
2009-10-02 11:46:14 +00:00
2011-02-25 10:16:00 -08:00
2011-02-14 19:43:16 +01:00
2011-02-14 19:43:16 +01:00
2010-01-06 00:20:15 -05:00
2010-09-03 17:50:29 -04:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2010-02-17 12:03:14 -05:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-02-28 15:39:43 -08:00
2011-02-14 19:43:16 +01:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-02-26 00:34:44 +01:00
2011-02-14 19:43:16 +01:00
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2011-02-03 11:49:00 -05:00
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2011-02-14 19:43:16 +01:00
2011-02-14 19:43:16 +01:00
2010-09-15 14:10:18 -07:00
2011-02-14 19:43:16 +01:00
2010-10-26 23:46:18 -04:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-02-03 11:30:14 -05:00
2010-09-15 14:10:18 -07:00
2011-02-28 15:39:43 -08:00
2011-02-14 19:43:16 +01:00
2011-02-28 15:39:43 -08:00
2011-02-28 15:39:43 -08:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2011-01-29 23:10:15 +01:00
2010-09-03 17:50:29 -04:00
2011-02-28 15:39:43 -08:00
2010-01-18 09:37:42 -08:00