[zanata/zanata] 8524c2: Changes to account merge feature.

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 8524c28c20919069039ef4ffd26b98a6c9e5d748
      https://github.com/zanata/zanata/commit/8524c28c20919069039ef4ffd26b98a6c9e5d748
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-10-03 (Wed, 03 Oct 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Changes to account merge feature.

Verbiage and style changes.
When inactivating a "merged-in" account, the email will be appended with a predetermined string to make sure the email address is reusable.