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	Merge branch '4.0'	2014-08-07 16:51:03 +02:00
resources/org.jivesoftware.smackx	Move "Message Events (XEP-22)" code to legacy	2014-07-16 12:01:03 +02:00