Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Fri, 6 May 2011 21:56:47 +0000 (22:56 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 6 May 2011 21:56:47 +0000 (22:56 +0100)
1  2 
config/locales/de.yml
config/locales/en.yml

Simple merge
Simple merge