From: Antony Pegg <antthelimey@gmail.com>
Date: Thu, 14 Apr 2011 11:51:10 +0000 (-0400)
Subject: Merge branch 'master' into mapquest
X-Git-Tag: 2.1~1^2~16
X-Git-Url: https://git.openstreetmap.org/potlatch2.git/commitdiff_plain/348d89a97d6c59455611eea1c37dd74886414514

Merge branch 'master' into mapquest
---

348d89a97d6c59455611eea1c37dd74886414514