Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 24 Aug 2011 20:25:05 +0000 (21:25 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 24 Aug 2011 20:25:05 +0000 (21:25 +0100)
commit18883b59c88940b9bd323756e60603302f185dfd
tree24f0de3fa446814a4c4a1a330c8f4bf67273aacb
parent0e7324839b2f1cd6a2d07be073ae14dfbf611beb
parent69d02c624fe077cff0c39c3c8c658d8407eac278
Merge branch 'master' into openstreetbugs
config/locales/de.yml