From: Dennis Nienhüser Date: Mon, 3 Jan 2011 16:19:51 +0000 (-0500) Subject: Merge branch 'master' of https://vcs.maemo.org/git/marble X-Git-Url: https://vcs.maemo.org/git/?p=marble;a=commitdiff_plain;h=c5983229ca26fd28e7a27f729c6e908e089b5bef Merge branch 'master' of https://vcs.maemo.org/git/marble --- c5983229ca26fd28e7a27f729c6e908e089b5bef