Florian Schmaus 3bdeca44f2 Merge branch '4.2'		2018-02-23 18:35:34 +01:00
..
java/org/jivesoftware	Merge branch '4.2'	2018-02-23 18:35:34 +01:00
resources/org.jivesoftware.smack.extensions	New Jingle API groundwork	2017-05-30 08:45:27 +02:00