From: Matt Amos <zerebubuth@gmail.com>
Date: Sat, 8 Mar 2014 10:18:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into vagrant
X-Git-Tag: live~4484
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f2d13c075660efb9582d7fb600bd6798d7a382ca

Merge remote-tracking branch 'upstream/master' into vagrant
---

f2d13c075660efb9582d7fb600bd6798d7a382ca