Updated merge info

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-4659@1471145 13f79535-47bb-0310-9956-ffa450edef68
tree: f0d8abd3367deb87ca9095b4e4e84be2f6870b92
  1. qpid/
  2. .gitignore