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
..
main	Merge branch '4.1'	2015-05-24 22:36:11 +02:00
test/java/org/jivesoftware/smack	Remove package-info.java from test packages	2015-04-05 10:48:00 +02:00