Florian Schmaus d06d5b7c69 Merge branch '4.0' ... Conflicts: build.gradle		2014-07-20 14:19:59 +02:00
..
main	Merge branch '4.0'	2014-07-20 14:19:59 +02:00
test/java/org/jivesoftware/smackx	Cleanup carbons, forwarded and a few others API	2014-07-16 11:46:30 +02:00