Florian Schmaus 2079ba6bd6 Merge branch '4.1' ... Conflicts: smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java		2015-05-27 22:50:55 +02:00
..
java/org/jivesoftware/smack	Merge branch '4.1'	2015-05-27 22:50:55 +02: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