Florian Schmaus bbc7aaae77 Smack 4.1.1 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAABCgBmBQJVTgmuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxMzU3QjAxODY1QjI1MDNDMTg0NTNEMjA4 Q0FDMkE5Njc4NTQ4RTM1AAoJEIysKpZ4VI41MXUH/3A5Jc6rzALhnXMT4yj+jXow rLLX5/ypOvkAXEMRlTf9xd2apz4hT8dMsBcL3JvZscuVmkw0/woh9eV/PFSDoc7t HA7bMZRqWqUuVOezFD0ggHsJ7zfpcIuxsgoNARQlCRMPHzCLzKhMNctz5UApAdfy +wPpTMpc3K5SM1bNlM60qp+dbPCqQcLwYP02KrOQASgenVDm6iKFpzx0ieVpPY1M hOBMyaZg3n2j+267gpqBG6c7PVmEq3deAlB6BOBAsL/Bp1w5B5Smq959LWJLstrU /LeYJFi1TeIASiFy1vZyTV0Tw+Pe++3gB6ppLqkQhfWV8vXzm0coCXx29qWxAzM= =pGJt -----END PGP SIGNATURE----- Merge tag '4.1.1' Smack 4.1.1 Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java version.gradle		2015-05-09 15:42:09 +02:00
..
java7	Smack 4.1.1	2015-05-09 15:42:09 +02:00
util/stringencoder	Add FinalClass checkstyle check	2015-04-06 10:45:12 +02:00