[zanata-commits] [zanata/zanata] 823ed1: Merge remote branch 'origin/1.4' into 1.4

[noreply at github.com]

  Branch: refs/heads/1.4
  Home:   https://github.com/zanata/zanata

  Commit: 823ed1a80b71390c3fb6e65de91f94a8499587d4
      https://github.com/zanata/zanata/commit/823ed1a80b71390c3fb6e65de91f94a8499587d4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-03 (Mon, 03 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  R server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
  R server/zanata-war/src/main/webapp/WEB-INF/layout/project_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
  M server/zanata-war/src/main/webapp/language/home.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/search.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge remote branch 'origin/1.4' into 1.4