Florian Schmaus 81002c4fbd Merge branch '4.2'		2017-11-22 08:37:47 +01:00
..
main	Merge branch '4.2'	2017-11-22 08:37:47 +01:00
test/java/org/jivesoftware/smack	Merge branch '4.2'	2017-06-17 15:55:38 +02:00