[zanata/zanata] 7973d5: Fix unexpected error when config file download: ht...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 7973d5db338578e89fa6b56576cf9f3b75a2526c
      https://github.com/zanata/zanata/commit/7973d5db338578e89fa6b56576cf9f3b75a2526c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Fix unexpected error when config file download: https://bugzilla.redhat.com/show_bug.cgi?id=909026


  Commit: a5c1837528102d0faea4c4f0dbc6f0d04a666a78
      https://github.com/zanata/zanata/commit/a5c1837528102d0faea4c4f0dbc6f0d04a666a78
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-11 (Mon, 11 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

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


Compare: https://github.com/zanata/zanata/compare/4ed20fea576d...a5c183752810