QPID-3394: merge fix from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.12@1154981 13f79535-47bb-0310-9956-ffa450edef68
2 files changed
tree: 893b637418e5ef26dee86e0a3083385e58e04975
  1. qpid/
  2. .gitignore