Florian Schmaus 81002c4fbd Merge branch '4.2'		2017-11-22 08:37:47 +01:00
..
java/org/jivesoftware/smack	Merge branch '4.2'	2017-11-22 08:37:47 +01:00
resources/org.jivesoftware.smack.tcp	Move Stream Management code into o.j.smack.sm	2015-01-18 11:07:47 +01:00