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

[GitHub]

  Branch: refs/heads/update-stats
  Home:   https://github.com/zanata/zanata-api
  Commit: 19e78b26c39c568ce8e0d05b3bf6ef0a1961c133
      https://github.com/zanata/zanata-api/commit/19e78b26c39c568ce8e0d05b3bf6ef0a1961c133
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-04 (Mon, 04 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/ContributionStatistics.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

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