[zanata-commits] [zanata/zanata] 6c4eda: Merge branch 'master' into rhbz756235

[noreply at github.com]

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

  Commit: 6c4edac60c0e43284503f95ca259e5a78651f4e8
      https://github.com/zanata/zanata/commit/6c4edac60c0e43284503f95ca259e5a78651f4e8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/comment/SimpleComment.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ExtensionSet.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/LocaleList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ResourceMetaList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

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