1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 14:02:06 +01:00
Smack/source/org/jivesoftware
Florian Schmaus 2ea5ee3b26 SMACK-425 fix merge error
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13691 b35dd754-fafc-0310-a699-88a17e54d16e
2013-06-24 07:25:20 +00:00
..
smack SMACK-425 fix merge error 2013-06-24 07:25:20 +00:00
smackx Merge from 3.3 branch 2013-05-18 16:56:52 +00:00