Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Tue, 31 May 2011 18:20:42 +0000 (19:20 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 31 May 2011 18:20:42 +0000 (19:20 +0100)
commitc20b31b54ed3043e9ebf3964aa7c08f5ddc73a95
tree7918784a140aa80cbb078254eacd9fc1ac4b28d1
parent5ff9f2d21c82a9ebe06be748a37de764d0861514
parentbf8bbdc22095074e7e15ac29999f0b0d6328133d
Merge branch 'master' into openstreetbugs
config/locales/de.yml
config/locales/en.yml