Smack/smack-tcp/src/main/java/org
Florian Schmaus fbf0ba13ce Merge Smack 4.1.0-rc2
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
	version.gradle
2015-02-21 18:07:45 +01:00
..
jivesoftware/smack Merge Smack 4.1.0-rc2 2015-02-21 18:07:45 +01:00