Merge changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32.x@1677957 13f79535-47bb-0310-9956-ffa450edef68
2 files changed
tree: 3820d37d633934defd05cab89b4dd33a2a41a61a
  1. qpid/
  2. .gitignore
  3. .mailmap