Florian Schmaus 92a6d01507 Merge branch '4.0' ... Also slightly improve OfflineMessageManager.getMessages() Conflicts: build.gradle smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java		2014-08-07 16:51:03 +02:00
..
java/org/jivesoftware/smack	Merge branch '4.0'	2014-08-07 16:51:03 +02:00
resources/org.jivesoftware.smack	Configure default Hostname Verifiers	2014-08-03 21:15:41 +02:00