Florian Schmaus 369878b6d9 Merge branch '4.1' ... Conflicts: version.gradle		2015-03-11 20:51:08 +01:00
..
src	Merge branch '4.1'	2015-03-11 20:51:08 +01:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00