Florian Schmaus 7735a5224c Merge branch '4.0' ... Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java		2014-07-14 14:31:09 +02:00
..
java/org/jivesoftware	Merge branch '4.0'	2014-07-14 14:31:09 +02:00
resources/org.jivesoftware.smackx	Merge branch '4.0'	2014-07-05 14:37:22 +02:00