tree 3820d37d633934defd05cab89b4dd33a2a41a61a
parent b87ca66c19dc354176c93e3ef8655ff09077aae4
author Robert Godfrey <rgodfrey@apache.org> 1430909390 +0000
committer Robert Godfrey <rgodfrey@apache.org> 1430909390 +0000

Merge changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32.x@1677957 13f79535-47bb-0310-9956-ffa450edef68