[zanata/zanata-server] b0fc15: Merge branch 'serialid-wordstat' into wildfly

[GitHub]

  Branch: refs/heads/wildfly
  Home:   https://github.com/zanata/zanata-server
  Commit: b0fc15199ab12da636f3df6d49c142fd5760bb03
      https://github.com/zanata/zanata-server/commit/b0fc15199ab12da636f3df6d49c142fd5760bb03
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge branch 'serialid-wordstat' into wildfly