Florian Schmaus 431e5b3c67 Merge branch '4.2' into master-paul-merged		2017-12-17 11:16:02 +01:00
..
java/org/jivesoftware/smack	Merge branch '4.2' into master-paul-merged	2017-12-17 11:16:02 +01:00
resources/org.jivesoftware.smack.im	Added support for pre-approved subscription requests (RFC 6121 § 3.4)	2015-03-19 11:31:05 +01:00