[zanata-commits] [zanata/zanata] 9ccb51: Merge branch 'hibernate-3.6'

[noreply at github.com]

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

  Commit: 9ccb516c450d29884f19a6ebd45186a24cb59c79
      https://github.com/zanata/zanata/commit/9ccb516c450d29884f19a6ebd45186a24cb59c79
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'hibernate-3.6'