From: Tom Hughes <tom@compton.nu>
Date: Tue, 20 Apr 2010 20:47:57 +0000 (+0100)
Subject: Merge branch 'wikilinks'
X-Git-Tag: live~6387^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9816c7dd0a6880589f2310f64b1acf672f4497e5

Merge branch 'wikilinks'
---

9816c7dd0a6880589f2310f64b1acf672f4497e5