Daniel Gultsch 7bd0f31244 Merge branch 'master' into development		2015-08-23 17:57:53 +02:00
..
java/eu/siacs/conversations	Merge branch 'master' into development	2015-08-23 17:57:53 +02:00
res	pulled translations from transifex	2015-08-19 13:03:14 +02:00
AndroidManifest.xml	remove the READ_PHONE_STATE permission.	2015-08-23 13:07:27 +02:00