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
..
ReportedData.java	Merge branch '4.1'	2015-03-24 17:16:18 +01:00
SimpleUserSearch.java	Make FormField.Type an enum	2014-12-27 21:12:48 +01:00
UserSearch.java	Make Provider.parse() just throw Exception	2015-03-13 09:27:18 +01:00
UserSearchManager.java	Use Jid (and subclasses) from jxmpp-jid	2015-02-17 16:07:16 +01:00