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
..
packet	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
OfflineMessageHeader.java	Use Jid (and subclasses) from jxmpp-jid	2015-02-17 16:07:16 +01:00
OfflineMessageManager.java	Merge branch '4.1'	2015-03-04 22:42:36 +01:00