Merge -r 20198:20540 from trunc into openstreetbugs branch
authorKai Krueger <kakrueger@gmail.com>
Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)
committerKai Krueger <kakrueger@gmail.com>
Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)
commit03f733c4f4091dc53e391aa74a020681af98a4ff
tree7218f509aea2106b66298954f2b0bd238e639116
parent6d668f6f3a8514d4cbf28984f80944ba149a0461
parenta2b438f0d7037ec41dc92859fab12718cc22b9a9
Merge -r 20198:20540 from trunc into openstreetbugs branch
config/environment.rb
config/locales/en.yml