Florian Schmaus 4a16ab9329 Merge branch '4.1' ... Conflicts: version.gradle		2015-04-12 18:32:55 +02:00
..
main/java/org/jivesoftware/smack/sasl/provided	Merge branch '4.1'	2015-04-12 18:32:55 +02:00
test/java/org/jivesoftware/smack/sasl/provided	Remove package-info.java from test packages	2015-04-05 10:48:00 +02:00