Merge "Moved Preferences::trySetUserEmail() to User::setEmailWithConfirmation()"
authorHashar <hashar@free.fr>
Tue, 3 Apr 2012 15:44:34 +0000 (15:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Apr 2012 15:44:34 +0000 (15:44 +0000)

Trivial merge