Smack/smack-core/src/main/java/org
Florian Schmaus 4a16ab9329 Merge branch '4.1'
Conflicts:
	version.gradle
2015-04-12 18:32:55 +02:00
..
jivesoftware/smack Merge branch '4.1' 2015-04-12 18:32:55 +02:00