[zanata-commits] [zanata/zanata] 649987: Merge remote branch 'origin/rhbz747501'

[noreply at github.com]

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

  Commit: 6499872845ce121f0b02ce511fc77c18e2049d45
      https://github.com/zanata/zanata/commit/6499872845ce121f0b02ce511fc77c18e2049d45
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-26 (Wed, 26 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
  R server/zanata-war/src/main/webapp-jboss/WEB-INF/components.xml
  M server/zanata-war/src/test/jboss-embedded-bootstrap/deployers/ejb3-deployers-beans.xml

  Log Message:
  -----------
  Merge remote branch 'origin/rhbz747501'

Conflicts:
	server/zanata-war/eclipse/launch/Integration_Tests.launch
	server/zanata-war/pom.xml


  Commit: 2e0a2e907dff91c710f6bec03531b3ff3738aa33
      https://github.com/zanata/zanata/commit/2e0a2e907dff91c710f6bec03531b3ff3738aa33
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-26 (Wed, 26 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java

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


  Commit: 876884ed029f1c0b72a76a111656b2990681d3da
      https://github.com/zanata/zanata/commit/876884ed029f1c0b72a76a111656b2990681d3da
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-26 (Wed, 26 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/admin/search.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata


Compare: https://github.com/zanata/zanata/compare/59e63ff...876884e