Florian Schmaus 24f7de8d54 Merge branch '4.0' ... Conflicts: build.gradle		2014-08-19 11:32:57 +02:00
..
src	Merge branch '4.0'	2014-08-19 11:32:57 +02:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00