Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:30:55 +0000 (21:30 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:30:55 +0000 (21:30 +0100)
commit52395b3cdf4d3cfae95730158edeeccf3d062a8e
tree4dbd18dae27b4b9c798ca940fdb9567898299fcd
parent02ad2f5a5192404185d00ec1b53ae2982760c0ea
parent72984673067a37a1ea687709a33b18263f850633
Merge branch 'master' into openstreetbugs
config/environment.rb
config/locales/en.yml