Merge -r 20198:20540 from trunc into openstreetbugs branch
authorKai Krueger <kakrueger@gmail.com>
Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)
committerKai Krueger <kakrueger@gmail.com>
Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)
1  2 
config/environment.rb
config/locales/en.yml

Simple merge
Simple merge