[zanata/zanata-common] 1f6bc2: Merge branch 'integration/master' into rhbz1245433...

[GitHub]

  Branch: refs/heads/rhbz1245433-glossary
  Home:   https://github.com/zanata/zanata-common
  Commit: 1f6bc2ad7a947851b36da79e91cba1184e6d5757
      https://github.com/zanata/zanata-common/commit/1f6bc2ad7a947851b36da79e91cba1184e6d5757
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-08-11 (Tue, 11 Aug 2015)

  Changed paths:
    M pom.xml
    A pom.xml.orig
    M zanata-adapter-glossary/src/main/java/org/zanata/adapter/glossary/GlossaryCSVReader.java
    M zanata-adapter-glossary/src/main/java/org/zanata/adapter/glossary/GlossaryPoReader.java
    M zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java
    M zanata-common-util/src/main/java/org/zanata/common/util/GlossaryUtil.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1245433-glossary