Florian Schmaus 3bdeca44f2 Merge branch '4.2'		2018-02-23 18:35:34 +01:00
..
main/java/org	Merge branch '4.2'	2018-02-23 18:35:34 +01:00
test/java/org/igniterealtime/smack/inttest	Fix minor codestyle issues	2017-12-17 11:03:46 +01:00