Enno Rehling 3a719226a2 Merge branch 'master' into develop ... Conflicts: src/buildno.h		2016-09-01 21:55:52 +02:00
..
strings.xml	Merge branch 'master' into develop	2016-09-01 21:55:52 +02:00