tree af8ae0b38b2542a640377782611901434fd82eff
parent d9d77a7c1677b08322459354f5daf95aba534020
author Robert Godfrey <rgodfrey@apache.org> 1430911285 +0000
committer Robert Godfrey <rgodfrey@apache.org> 1430911285 +0000

Merge changes from trunk

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