Smack/smack-tcp/src/main/java
Florian Schmaus 24f7de8d54 Merge branch '4.0'
Conflicts:
	build.gradle
2014-08-19 11:32:57 +02:00
..
org/jivesoftware/smack/tcp Merge branch '4.0' 2014-08-19 11:32:57 +02:00