Florian Schmaus 3e18a23e47 Merge branch '4.0' ... Conflicts: build.gradle smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java		2014-06-07 12:24:51 +02:00
..
src	Merge branch '4.0'	2014-06-07 12:24:51 +02:00
.gitignore	Prefix subprojects with 'smack-'	2014-04-28 19:44:14 +02:00
build.gradle	Use fixed versions instead of dynamic dependencies	2014-06-03 13:10:43 +02:00