tree f0d8abd3367deb87ca9095b4e4e84be2f6870b92
parent 985af562e1c232940251fc75c199ad9a51e356bb
author Robert Godfrey <rgodfrey@apache.org> 1366751154 +0000
committer Robert Godfrey <rgodfrey@apache.org> 1366751154 +0000

Updated merge info

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