Florian Schmaus 4a16ab9329 Merge branch '4.1' ... Conflicts: version.gradle		2015-04-12 18:32:55 +02:00
..
java/org/jivesoftware/smack	Merge branch '4.1'	2015-04-12 18:32:55 +02:00
resources/org.jivesoftware.smack.tcp	Move Stream Management code into o.j.smack.sm	2015-01-18 11:07:47 +01:00