tree 88fb083e8ba35ef02a856ae2f81b9db6cf059a2b
parent 1f1c7c79979124eb78a9d6cc4dd5c37f8e5cda8b
parent 4f6c76e758b3f1b279e720c285332db76cc03abb
author Shawn Pearce <sop@google.com> 1368906234 -0700
committer Shawn Pearce <sop@google.com> 1368906234 -0700

Merge 'preferred-email' into stable-2.5

* preferred-email:
  Require preferred email to be a verified address