Changed something
Merge branch 'trunk' of https://github.com/apache/activemq into trunk
Revert "Changed something"

This reverts commit 1c37c54bd5eeeeba12c6f3ace8f9852855d32b74.
Merge branch 'release/1.0' into trunk
https://issues.apache.org/jira/browse/AMQ-5138
Fix for AMQ-5135, added amqp karaf verification via roundtrip test
Use xbean 3.16 like Camel does. 3.17 does not work as it requires asm5.
https://issues.apache.org/jira/browse/AMQ-5141 - send messages to dlq using broker security context
https://issues.apache.org/jira/browse/AMQ-5149 - potential deadlock
https://issues.apache.org/jira/browse/AMQ-5146 - validate redeliveryPolicy excess pre dispatch, fix and test
Merge branch 'trunk' of https://github.com/apache/activemq into trunk
Merge branch 'develop' of https://github.com/inventit/activemq into trunk
protocol converter in progress
Add message converter
Fix topic name which stored in received message
ver.1.2
Merge branch 'trunk' of https://github.com/inventit/activemq into trunk