[zanata/zanata-server] b8b4aa: disable google merge account

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-server
  Commit: b8b4aaf27f830e811c379ed2b8d88f0bb7070f7c
      https://github.com/zanata/zanata-server/commit/b8b4aaf27f830e811c379ed2b8d88f0bb7070f7c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  disable google merge account


  Commit: 92d1d9fbb0dcc59e360321fbdc59b1e884cccfc1
      https://github.com/zanata/zanata-server/commit/92d1d9fbb0dcc59e360321fbdc59b1e884cccfc1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge branch 'release' into disable-google-merge-account


  Commit: 70d9ef2ba04c305488e83edbaa6af4ee410e1347
      https://github.com/zanata/zanata-server/commit/70d9ef2ba04c305488e83edbaa6af4ee410e1347
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge pull request #870 from zanata/disable-google-merge-account

disable google merge account


Compare: https://github.com/zanata/zanata-server/compare/403c454079c3...70d9ef2ba04c