Florian Schmaus 369878b6d9 Merge branch '4.1' ... Conflicts: version.gradle		2015-03-11 20:51:08 +01:00
..
DiscoverInfo.java	Add TypedCloneable	2015-03-10 22:50:48 +01:00
DiscoverItems.java	Use Jid (and subclasses) from jxmpp-jid	2015-02-17 16:07:16 +01:00