tree 563df3e3637b1868857d4e30e6ac7e356c8ad344
parent 0a64e2b857dc189a621d51dffedf573746bd08e5
author Robert Godfrey <rgodfrey@apache.org> 1396649424 +0000
committer Robert Godfrey <rgodfrey@apache.org> 1396649424 +0000

Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-store-changes@1584926 13f79535-47bb-0310-9956-ffa450edef68