Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 18 Sep 2011 13:26:59 +0000 (14:26 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 18 Sep 2011 13:26:59 +0000 (14:26 +0100)
1  2 
config/example.application.yml
config/locales/de.yml

Simple merge
Simple merge