Florian Schmaus 83b84c5bd3 Merge branch '4.1' ... Conflicts: smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java version.gradle		2015-03-24 17:16:18 +01:00
..
chat	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
im	Create smack-im subproject for XMPP-IM	2015-01-26 07:54:05 +01:00
roster	Javadoc improvements	2015-03-21 18:59:12 +01:00