From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 21:04:46 +0000 (-0500)
Subject: Merge remote branch 'origin/moveaccount' into moveaccount
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=64750a6455948a57f8e669f898ad5f613f43ba49;p=quix0rs-gnu-social.git

Merge remote branch 'origin/moveaccount' into moveaccount

Conflicts:
	lib/accountmover.php
---

64750a6455948a57f8e669f898ad5f613f43ba49