Florian Schmaus 177ab983d4 Merge branch '4.0' ... Conflicts: build.gradle smack-tcp/src/main/java/org/jivesoftware/smack/tcp/PacketReader.java		2014-10-22 22:25:20 +02:00
..
src	Merge branch '4.0'	2014-10-22 22:25:20 +02:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00