[zanata/zanata] 9c1dde: Fixed bad auto-merge

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 9c1dde329403b0ca5e708e486163e221ea9970c1
      https://github.com/zanata/zanata/commit/9c1dde329403b0ca5e708e486163e221ea9970c1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-02-06 (Mon, 06 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java

  Log Message:
  -----------
  Fixed bad auto-merge