From: Andreas Gohr <gohr@cosmocode.de>
Date: Tue, 26 Aug 2014 09:39:59 +0000 (+0200)
Subject: Merge commit '4bddd2bb3ff5fd3eec8886302a01dc8191ae1465' into cweiske
X-Git-Tag: 0.8.0~5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f761878d5f31fe5b1b53215391565d2262cf162e;p=contagged

Merge commit '4bddd2bb3ff5fd3eec8886302a01dc8191ae1465' into cweiske

This is a fake merge, ignoring the commit

* commit '4bddd2bb3ff5fd3eec8886302a01dc8191ae1465':
  Use leafletjs + OpenStreetMap instead of google maps
---

f761878d5f31fe5b1b53215391565d2262cf162e