Smack/smack-experimental/src/main/java
Florian Schmaus d06d5b7c69 Merge branch '4.0'
Conflicts:
	build.gradle
2014-07-20 14:19:59 +02:00
..
org/jivesoftware Merge branch '4.0' 2014-07-20 14:19:59 +02:00