Florian Schmaus 01f08e87c2 Merge branch '4.1' ... Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java version.gradle		2015-05-24 22:36:11 +02:00
..
java/org/jivesoftware/smack	Merge branch '4.1'	2015-05-24 22:36:11 +02:00
resources/org.jivesoftware.smack.tcp	Move Stream Management code into o.j.smack.sm	2015-01-18 11:07:47 +01:00