Florian Schmaus d06d5b7c69 Merge branch '4.0' ... Conflicts: build.gradle		2014-07-20 14:19:59 +02:00
..
src	Merge branch '4.0'	2014-07-20 14:19:59 +02:00
build.gradle	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00