tomkat83 0bd4a79ca3 Merge conflicts: sync after screensaver deactivated		2016-05-15 16:02:19 +02:00
..
strings.xml	Merge conflicts: sync after screensaver deactivated	2016-05-15 16:02:19 +02:00