Merge branch 'upstream'
[navit-package] / NEWS