Florian Schmaus 3c4225d167 Merge branch '4.2'		2017-12-25 14:16:43 +01:00
..
java/org/jivesoftware	Merge branch '4.2'	2017-12-25 14:16:43 +01:00
resources/org.jivesoftware.smack.extensions	New Jingle API groundwork	2017-05-30 08:45:27 +02:00