Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 27 Jun 2010 15:29:52 +0000 (16:29 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 27 Jun 2010 15:29:52 +0000 (16:29 +0100)
commit02ad2f5a5192404185d00ec1b53ae2982760c0ea
tree3e7d2d97bd2d6fc0454d682f42cad048b5b4ec5e
parentb9c9d6c1aafdd60c72b54345b4d2dc94317298a0
parent98d73aead102c88cab0f2ebd2b027545d2e0b836
Merge branch 'master' into openstreetbugs
config/locales/en.yml
config/routes.rb