Florian Schmaus b18a43920a Merge branch '3.4.0' into master ... Conflicts: source/org/jivesoftware/smack/SmackConfiguration.java		2014-02-03 12:58:55 +01:00
..
smack	SMACK-387 Added some configuration to the ChatManager to allow for different matching modes on incoming messages with no thread id.	2014-02-01 22:22:30 +00:00
smackx	Merge branch '3.4.0' into master	2014-02-03 12:58:55 +01:00
util	SMACK-458 Managers should be kept on disconnects	2013-10-26 11:17:16 +00:00