refs/heads/QPID-6262-JavaBrokerNIO - qpid - Git at Google

commit: 49c02f9fcf8c2dd1b063c887f8948f840ec785c2
[log] [tgz]
author: Keith Wall <kwall@apache.org>
Thu Mar 12 15:13:16 2015 +0000
committer: Keith Wall <kwall@apache.org>
Thu Mar 12 15:13:16 2015 +0000
tree: 7fa009399d501d9ad3e9f77f735d85a2b75807cf
parent: d31279a6374f4fd4326d04fdae456543547d441f [diff]
parent: b66b4f357a756449c7e7184be4d963fb36f5b2d4 [diff]

Merge from trunk

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

tree: 7fa009399d501d9ad3e9f77f735d85a2b75807cf