Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Fri, 29 Apr 2011 16:06:10 +0000 (17:06 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 29 Apr 2011 16:06:10 +0000 (17:06 +0100)
1  2 
config/locales/de.yml

Simple merge