From: Evan Prodromou Date: Mon, 10 Jan 2011 19:57:50 +0000 (-0500) Subject: Merge branch 'moveaccount' of gitorious.org:~evan/statusnet/evans-mainline into movea... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ea8b086cb2b9ae42eb2a165786ee7aa7f3224283;p=quix0rs-gnu-social.git Merge branch 'moveaccount' of gitorious.org:~evan/statusnet/evans-mainline into moveaccount Conflicts: scripts/moveuser.php --- ea8b086cb2b9ae42eb2a165786ee7aa7f3224283