Florian Schmaus 1ed5c48bcc Merge branch '4.0' ... Conflicts: smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java		2014-07-16 10:52:58 +02:00
..
integration-test	Change IQ.Type to enum	2014-06-06 21:10:13 -03:00
main	Merge branch '4.0'	2014-07-16 10:52:58 +02:00
test	Remove Packet.ID_NOT_AVAILABLE	2014-07-06 23:57:06 +02:00