From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 29 Apr 2010 20:58:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.openstreetmap.org/rails
X-Git-Tag: live~6376^2~6
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1ae014afa1e9cb79abea820610beea1bcf66b99c

Merge branch 'master' of git://git.openstreetmap.org/rails
---

1ae014afa1e9cb79abea820610beea1bcf66b99c