Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 24 Aug 2011 20:25:05 +0000 (21:25 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 24 Aug 2011 20:25:05 +0000 (21:25 +0100)
1  2 
config/locales/de.yml

Simple merge