Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/offline
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
..
packet Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
OfflineMessageHeader.java Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
OfflineMessageManager.java Merge branch '4.0' 2014-08-07 16:51:03 +02:00