1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-07-01 15:46:43 +02:00
Smack/test/org
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
..
jivesoftware Merge branch '3.4.0' into master 2014-02-03 12:58:55 +01:00