[zanata/zanata-server] 4be04f: Fix placeholder in server config page

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 4be04f5e536047adfa7f5434b0916804b7bcf92d
      https://github.com/zanata/zanata-server/commit/4be04f5e536047adfa7f5434b0916804b7bcf92d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Fix placeholder in server config page

https://bugzilla.redhat.com/show_bug.cgi?id=1185134

Squashed commit of the following:

commit 42265a7669cddca3a5bb518cbee0b9f67988756d
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 09:29:07 2015 +1000

    Fix input field not save when using same text as placeholder: https://bugzilla.redhat.com/show_bug.cgi?id=1185134


  Commit: a100b9f97b0d43054ae841e995af1cb19011c122
      https://github.com/zanata/zanata-server/commit/a100b9f97b0d43054ae841e995af1cb19011c122
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/resources/messages.properties

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


Compare: https://github.com/zanata/zanata-server/compare/fe5c02ccd427...a100b9f97b0d