Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Fri, 6 May 2011 21:56:47 +0000 (22:56 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 6 May 2011 21:56:47 +0000 (22:56 +0100)
commite7cd90f4b4d431b32a92ca68c3df817e8e765d09
tree51aa4cf2154a85f4b89f3ca4a1041c2b49f13074
parent647638822269df68bc807a1104baa280207f3f6b
parent924d09229e9a34f167cf24ad17c94808d1711627
Merge branch 'master' into openstreetbugs
config/locales/de.yml
config/locales/en.yml