[zanata/zanata] cbe50e: fix conflict

[GitHub]

  Branch: refs/heads/rhbz846314
  Home:   https://github.com/zanata/zanata
  Commit: cbe50e5647fb8d41005c41a0fd1d9f3b9d754ac3
      https://github.com/zanata/zanata/commit/cbe50e5647fb8d41005c41a0fd1d9f3b9d754ac3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/HistoryEventHandlerServiceTest.java

  Log Message:
  -----------
  fix conflict