Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 22 May 2011 16:59:35 +0000 (17:59 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 22 May 2011 16:59:35 +0000 (17:59 +0100)
commit5ff9f2d21c82a9ebe06be748a37de764d0861514
treecf2583ba3e7ca635ad44d761b6f4fc145e9fff3b
parent83821816359187fa2b877a29b7ab7d9f974c17b5
parent8faad225f0677de3b43e0afd7a914be89ed43b2b
Merge branch 'master' into openstreetbugs
config/locales/en.yml