Smack/smack-tcp/src/main/java
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
org/jivesoftware/smack Merge branch '4.1' 2015-03-11 20:51:08 +01:00