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
..
org/jivesoftware/smack	Merge branch '4.0'	2014-07-16 10:52:58 +02:00