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-08-16 02:52:23 +00:00
2010-03-04 08:49:04 -08:00
2009-08-11 14:41:48 +12:00
2010-11-09 12:53:57 -05:00
2010-12-17 16:22:26 -08:00
2010-02-25 22:30:04 -05:00
2011-01-23 16:51:18 -05:00
2009-05-21 05:43:11 +00:00
2009-06-23 09:16:41 -07:00
2009-10-21 22:43:40 -04:00
2011-01-26 10:51:44 -08:00
2010-01-13 17:28:31 -08:00
2010-01-27 17:34:13 -08:00
2010-07-28 11:50:04 -04:00
2010-07-28 11:43:47 -04:00
2011-01-05 13:13:45 -05:00
2010-08-16 14:47:18 +12:00
2010-12-17 17:13:21 -08:00