[zanata-commits] [zanata/zanata] 5da29d: Correct merge bug in iteration view.

[noreply at github.com]

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

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

  Changed paths:
    M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml

  Log Message:
  -----------
  Correct merge bug in iteration view.