Daniel Gultsch 0fb1772f18 Merge pull request #669 from SamWhited/scramcaching ... Cache SCRAM-SHA-1 keys for current session		2014-11-15 21:02:13 +01:00
..
java/eu/siacs/conversations	Merge pull request #669 from SamWhited/scramcaching	2014-11-15 21:02:13 +01:00
res	Update Spanish Translations	2014-11-15 20:48:31 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00