[zanata/zanata] 9931f2: Merge branch 'master' into rhbz756235

[noreply at github.com]

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

  Commit: 9931f26e01fa97a094e0847f72413974f93765a2
      https://github.com/zanata/zanata/commit/9931f26e01fa97a094e0847f72413974f93765a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz756235


  Commit: cafb78a7fdd9ead7bdd511ea9c239ea0e3d7e2df
      https://github.com/zanata/zanata/commit/cafb78a7fdd9ead7bdd511ea9c239ea0e3d7e2df
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  Fix 'Option' button display


Compare: https://github.com/zanata/zanata/compare/d3759d7...cafb78a