[zanata/zanata-api] 51d39a: Merge branch 'integration/master' into update-stat...

[GitHub]

  Branch: refs/heads/update-stats
  Home:   https://github.com/zanata/zanata-api
  Commit: 51d39a643d61c467d2227fb0e94df919af0a72da
      https://github.com/zanata/zanata-api/commit/51d39a643d61c467d2227fb0e94df919af0a72da
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-11 (Mon, 11 Jan 2016)

  Changed paths:
    A zanata-common-api/src/main/java/org/zanata/rest/dto/TransUnitStatus.java
    A zanata-common-api/src/main/java/org/zanata/rest/dto/User.java
    M zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/BaseContributionStatistic.java
    M zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/ContributionStatistics.java
    M zanata-common-api/src/main/java/org/zanata/rest/dto/stats/contribution/LocaleStatistics.java
    M zanata-common-api/src/main/java/org/zanata/rest/service/ProjectVersionResource.java
    A zanata-common-api/src/test/java/org/zanata/rest/dto/TransUnitStatusTest.java
    A zanata-common-api/src/test/java/org/zanata/rest/dto/UserTest.java
    M zanata-common-api/src/test/java/org/zanata/rest/dto/stats/contribution/ContributionStatisticsTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into update-stats