Florian Schmaus 4a16ab9329 Merge branch '4.1' ... Conflicts: version.gradle		2015-04-12 18:32:55 +02:00
..
src	Merge branch '4.1'	2015-04-12 18:32:55 +02:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00