[zanata/zanata-server] 188ca6: Update assets version to 6.1

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 188ca6872305995ccb6e8d0e9dee2992d9c48b4f
      https://github.com/zanata/zanata-server/commit/188ca6872305995ccb6e8d0e9dee2992d9c48b4f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update assets version to 6.1
https://bugzilla.redhat.com/show_bug.cgi?id=875965


  Commit: 90df3ec5fe4a3e441a8aafe77be5367246ecad1c
      https://github.com/zanata/zanata-server/commit/90df3ec5fe4a3e441a8aafe77be5367246ecad1c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #742 from zanata/rhbz875965

Update assets version to 6.1 for whitespace changes


  Commit: bfeace93bca7daeede9a8ca6f8ef13f6e2013bf9
      https://github.com/zanata/zanata-server/commit/bfeace93bca7daeede9a8ca6f8ef13f6e2013bf9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release notes for bugzilla 875965, 1205465, 1205468


  Commit: c58827464f92f6007757f9e987495762bb2a9685
      https://github.com/zanata/zanata-server/commit/c58827464f92f6007757f9e987495762bb2a9685
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #749 from zanata/add-release-note

Update release notes for bugzilla 875965, 1205465, 1205468


  Commit: df6cae674be93b1d3be41283695028c431bc45c6
      https://github.com/zanata/zanata-server/commit/df6cae674be93b1d3be41283695028c431bc45c6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

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

Conflicts:
	docs/release-notes.md
	zanata-war/pom.xml


Compare: https://github.com/zanata/zanata-server/compare/76eaefe82cd9...df6cae674be9