]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'moveaccount' of gitorious.org:~evan/statusnet/evans-mainline into movea...
authorEvan Prodromou <evan@status.net>
Mon, 10 Jan 2011 19:57:50 +0000 (14:57 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 10 Jan 2011 19:57:50 +0000 (14:57 -0500)
commitea8b086cb2b9ae42eb2a165786ee7aa7f3224283
treea4e990d58e0263ef3952d34bd9166a7c1c2770c8
parent566f7c42a5c6d2b1784e5bf86acae8f52f2a89eb
parentc937d3a8437e23cb5c1c2de3bc501bec8b725802
Merge branch 'moveaccount' of gitorious.org:~evan/statusnet/evans-mainline into moveaccount

Conflicts:
scripts/moveuser.php