[zanata/zanata] 396dc0: Merge branch 'master' of github.com:zanata/zanata ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 396dc0d260d8e88a393d8d26424e13c2a7085fd7
      https://github.com/zanata/zanata/commit/396dc0d260d8e88a393d8d26424e13c2a7085fd7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:zanata/zanata into integration/master