Florian Schmaus 369878b6d9 Merge branch '4.1' ... Conflicts: version.gradle		2015-03-11 20:51:08 +01:00
..
main	Merge branch '4.1'	2015-03-11 20:51:08 +01:00
test/java/org/jivesoftware/smack	Merge branch '4.1'	2015-03-04 22:42:36 +01:00