delta/python-packages/qpid-python.git/qpid/java/amqp-1-0-client-websocket/resources, branch java-broker-bdb-ha git.apache.org: qpid.git NO-JIRA: Merge latest changes back from trunk. 2014-01-14T14:46:35+00:00 Keith Wall kwall@apache.org 2014-01-14T14:46:35+00:00 840bf7469dc7b18d74eaa275bb23ed09dd0e168b Changes merged with command: svn merge -r 1549894:1558036 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha@1558056 13f79535-47bb-0310-9956-ffa450edef68 
Changes merged with command:

svn merge -r 1549894:1558036 https://svn.apache.org/repos/asf/qpid/trunk



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha@1558056 13f79535-47bb-0310-9956-ffa450edef68