[merkaartor/f14/master] (10 commits) ...- new upstream release - fixes broken translations

[Sven Lankes]

Summary of changes:

  08b8e3c... Initialize branch F-12 for merkaartor (*)
  858082b... Fix typo that causes a failure to update the common directo (*)
  6554e0f... Add patch to write log to /dev/null by default (bz# 544284) (*)
  ea879db... - new upstream release (*)
  ea876f4... - new upstream release (bugfixes only) (*)
  a3f3bf9... bump to fix changelog (*)
  e56d89a... - new upstream release (fixes #570663, #575044) (*)
  83d90a8... dist-git conversion (*)
  13551be... Initial pseudo merge for dist-git setup (*)
  1d04b0a... - new upstream release - fixes broken translations (*)

(*) This commit already existed in another branch; no separate mail sent