Merge remote-tracking branch 'openstreetmap/pull/891'
authorTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:46:56 +0000 (21:46 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:46:56 +0000 (21:46 +0100)
1  2 
config/locales/en.yml

Simple merge