Daniel Gultsch 4f4eff2353 Merge branch 'development'		2015-01-03 22:39:50 +01:00
..
java/eu/siacs/conversations	version bump to 0.10	2015-01-03 19:11:27 +01:00
res	Added and modified German translations	2015-01-03 19:35:58 +01:00
AndroidManifest.xml	migrated change password into separate activity	2015-01-03 00:11:02 +01:00