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)
commit7c98b41cc89068d049a18f8738276f19cd47095e
tree752b6183e24e2d5c39ea623e748946954d4eb328
parentc20b31b54ed3043e9ebf3964aa7c08f5ddc73a95
parent0a81411e68102cd8a755744bd4a1e2f6eafad549
Merge branch 'master' into openstreetbugs
config/example.application.yml
config/locales/en.yml