QPID-4883: merge fix from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1486100 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
tree: d52c0a8492d94059aed457127a43e061ed949d4c
  1. qpid/
  2. .gitignore