]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'openstreetmap/pull/1298'
authorTom Hughes <tom@compton.nu>
Mon, 26 Sep 2016 11:40:01 +0000 (12:40 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 26 Sep 2016 11:40:01 +0000 (12:40 +0100)

Trivial merge