Enno Rehling 4f7b274bf6 Merge branch 'master' into develop ... Conflicts: res/core/messages.xml src/buildno.h		2016-01-01 16:38:57 +01:00
..
strings.xml	Merge branch 'master' into develop	2016-01-01 16:38:57 +01:00