1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-07-04 09:12:36 +02:00
Smack/source/org/jivesoftware
Florian Schmaus 5f5805cd1c Merge branch '3.4'
Conflicts:
	build/build.xml
2014-02-10 09:09:02 +01:00
..
smack Merge branch '3.4' 2014-02-10 09:09:02 +01:00
smackx Merge branch '3.4' 2014-02-10 09:09:02 +01:00