[zanata/zanata-server] 512f62: Set merge=union for release-notes.md in .gitattrib...

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 512f620de51ba01058f19207e46f1a0288be5897
      https://github.com/zanata/zanata-server/commit/512f620de51ba01058f19207e46f1a0288be5897
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Set merge=union for release-notes.md in .gitattributes


  Commit: 86d1ae0665888e5f83dbc91f4e27b7cca7af5288
      https://github.com/zanata/zanata-server/commit/86d1ae0665888e5f83dbc91f4e27b7cca7af5288
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Merge pull request #769 from zanata/merge-release-notes

Set merge=union for release-notes.md in .gitattributes


  Commit: c63409a760de7f59cd1e7489f4067357bab09fad
      https://github.com/zanata/zanata-server/commit/c63409a760de7f59cd1e7489f4067357bab09fad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master


Compare: https://github.com/zanata/zanata-server/compare/5e9decdc0f7e...c63409a760de