From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Jul 2008 11:23:34 +0000 (+0000)
Subject: Merge potlatch_010 properly.
X-Git-Tag: live~7757
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/322d782c9c961b1b1fc6dd89d38391c3e26ec2b4

Merge potlatch_010 properly.
---

322d782c9c961b1b1fc6dd89d38391c3e26ec2b4