Florian Schmaus 4e6fbe7293 Merge branch '4.1' ... Conflicts: build.gradle version.gradle		2015-03-18 08:35:08 +01:00
..
src/main	Merge branch '4.1'	2015-03-18 08:35:08 +01:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00