Daniel Gultsch e664a0c936 Merge pull request #680 from ferdev1/patch-2 ... Fix string 2		2014-11-17 18:14:50 +01:00
..
java/eu/siacs/conversations	trim search before searching	2014-11-17 17:31:26 +01:00
res	Merge pull request #680 from ferdev1/patch-2	2014-11-17 18:14:50 +01:00
AndroidManifest.xml	initial smp support	2014-11-11 17:40:51 +01:00