Florian Schmaus 431e5b3c67 Merge branch '4.2' into master-paul-merged		2017-12-17 11:16:02 +01:00
..
java/org/jivesoftware	Merge branch '4.2' into master-paul-merged	2017-12-17 11:16:02 +01:00
resources/org.jivesoftware.smack.extensions	New Jingle API groundwork	2017-05-30 08:45:27 +02:00