Smack/smack-extensions/src/main/java/org/jivesoftware
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
smack/extensions Enable OSGi compliance via 'DynamicImport-Package: *' 2015-01-03 13:14:02 +01:00
smackx Merge branch '4.1' 2015-03-11 20:51:08 +01:00