Merge branch 'master' of pini-deb-guest@alioth.debian.org:/git/collab-maint/navit
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 15 Jun 2009 14:05:23 +0000 (16:05 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 15 Jun 2009 14:05:23 +0000 (16:05 +0200)
commite99e440a73906e9cf007523aa7788269e05f6bda
treecbc79860dc2ce4314ca07183f16a63c7f14da8e7
parent70a8b5b0dbc4155b88b53755141073d0301ffee0
parent782cda8a70f1479ee6bf98d8cc7a764e0d71e206
Merge branch 'master' of pini-deb-guest@alioth.debian.org:/git/collab-maint/navit

Conflicts:
debian/changelog
debian/control