Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 16 Jun 2010 20:19:12 +0000 (21:19 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jun 2010 20:19:12 +0000 (21:19 +0100)
1  2 
config/environment.rb
config/locales/en.yml

Simple merge
Simple merge