Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 18 Sep 2011 13:26:59 +0000 (14:26 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 18 Sep 2011 13:26:59 +0000 (14:26 +0100)
commit3a654c89197b40f4a623c0dd33b87b415623d97d
tree0955c5a1e059f3de63dfac975a9e38bf308d80fe
parent82eedbf6511faf136293fce5ffc394ee0bf3511a
parent3259bc7edecbcfc54eb70e3c0a1e07d6b582a46c
Merge branch 'master' into openstreetbugs
config/example.application.yml
config/locales/de.yml