Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 22 May 2011 16:59:35 +0000 (17:59 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 22 May 2011 16:59:35 +0000 (17:59 +0100)
1  2 
config/locales/en.yml

Simple merge