Merge remote branch 'origin/moveaccount' into moveaccount

Conflicts:
	lib/accountmover.php
This commit is contained in:
Evan Prodromou 2011-01-17 16:04:46 -05:00
commit 64750a6455

Diff Content Not Available