From: Joey Hess <joey@kitenet.net>
Date: Sat, 3 Mar 2012 21:32:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'anarcat/osm-fixes'
X-Git-Tag: 3.20120203~90
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4b3ce9df72f4c2204156d0705937f36b0e08e155

Merge remote-tracking branch 'anarcat/osm-fixes'
---

4b3ce9df72f4c2204156d0705937f36b0e08e155