Florian Schmaus f5ef42ec56 Merge branch '4.2'		2017-06-02 13:51:56 +02:00
..
java/org/jivesoftware/smack	Merge branch '4.2'	2017-05-25 11:25:36 +02:00
resources/org.jivesoftware.smack	Add OMEMO support	2017-06-02 13:40:10 +02:00