Florian Schmaus 3c4225d167 Merge branch '4.2'		2017-12-25 14:16:43 +01:00
..
main	Merge branch '4.2'	2017-12-25 14:16:43 +01:00
test/java/org/jivesoftware/smack	Merge branch '4.2' into master-paul-merged	2017-12-17 11:16:02 +01:00