[zanata-commits] [zanata/zanata] 4c4034: Merge branch 'master' of github.com:zanata/zanata

[noreply at github.com]

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

  Commit: 4c40347fbbc8706e08cf4fd849959b8ca7fae0a4
      https://github.com/zanata/zanata/commit/4c40347fbbc8706e08cf4fd849959b8ca7fae0a4
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml

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