Florian Schmaus 50e068b6a7 Merge branch '4.0' ... Conflicts: build.gradle		2014-09-29 14:00:48 +02:00
..
java/org/jivesoftware	Merge branch '4.0'	2014-09-29 14:00:48 +02:00
resources/org.jivesoftware.smackx	Add support for XEP-0059: Result Set Management	2014-09-13 12:28:18 +02:00