Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 22 Jun 2011 21:36:43 +0000 (22:36 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 22 Jun 2011 21:36:43 +0000 (22:36 +0100)
1  2 
config/example.application.yml
config/locales/en.yml

Simple merge
Simple merge