[zanata/zanata-server] b07873: Fix generate api issue

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: b07873274d76165b9cd4d4358d1c27a0d87fc842
      https://github.com/zanata/zanata-server/commit/b07873274d76165b9cd4d4358d1c27a0d87fc842
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

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

  Log Message:
  -----------
  Fix generate api issue
https://bugzilla.redhat.com/show_bug.cgi?id=119359

Squashed commit of the following:

commit 1835b479069daf30dc68f8eb1085e9bce1a39be7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 20 10:39:10 2015 +1000

    Fix generate api issue: https://bugzilla.redhat.com/show_bug.cgi?id=1193597


  Commit: d22d4432651da7bad8139ee736edaa7f045fb2d2
      https://github.com/zanata/zanata-server/commit/d22d4432651da7bad8139ee736edaa7f045fb2d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

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

  Log Message:
  -----------
  Merge branch 'release' into integration/master


Compare: https://github.com/zanata/zanata-server/compare/b319ce824c4f...d22d4432651d