[zanata-commits] [zanata/zanata] 339606: Merge branch 'master' into rhbz750673

[noreply at github.com]

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

  Commit: 3396066e73d990c6ec907b28d028e5c449fc3703
      https://github.com/zanata/zanata/commit/3396066e73d990c6ec907b28d028e5c449fc3703
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-17 (Thu, 17 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  A server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
  M server/zanata-war/src/main/webapp/home.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  A server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz750673