vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/source/org
History
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