Florian Schmaus 34bc13bec7 Merge branch '4.0' ... Conflicts: build.gradle smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java		2014-09-05 22:11:35 +02:00
..
src	Merge branch '4.0'	2014-09-05 22:11:35 +02:00
build.gradle	Create smack.util.stringencoder for Base64, Base32,…	2014-09-04 11:07:55 +02:00