Florian Schmaus a48e8ef843 Merge branch '4.2'		2018-02-21 20:13:05 +01:00
..
main	Merge branch '4.2'	2018-02-21 20:13:05 +01:00
test/java/org/jivesoftware/smack	Merge branch '4.2' into master-paul-merged	2017-12-17 11:16:02 +01:00