[zanata-commits] [zanata/zanata] 6b578f: Merge branch '1.4'

[noreply at github.com]

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

  Commit: 6b578f2abeb22921515550d7485169b7dfce7a00
      https://github.com/zanata/zanata/commit/6b578f2abeb22921515550d7485169b7dfce7a00
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-10-19 (Wed, 19 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	server/zanata-war/src/main/webapp/stylesheet/theme.css
	server/zanata-war/src/main/webapp/stylesheet/zanata.css