Smack/smack-bosh
Florian Schmaus 24f7de8d54 Merge branch '4.0'
Conflicts:
	build.gradle
2014-08-19 11:32:57 +02:00
..
src/main/java/org/jivesoftware/smack/bosh Merge branch '4.0' 2014-08-19 11:32:57 +02:00
build.gradle Use jxmpp-core (0.1.0-alpha1-SNAPSHOT) 2014-06-01 12:24:30 +02:00