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)
commitb9c9d6c1aafdd60c72b54345b4d2dc94317298a0
tree78ad1c6231788ac618e2c2d13bc6d4956ba4ef9f
parent50224b473bce736436d27c64bd46c1910e4d43ec
parentb43f9c47145a14b547a900d9559f9aa3fd0895d1
Merge branch 'master' into openstreetbugs
config/environment.rb
config/locales/en.yml