Merge branch 'master' of git://git.openstreetmap.org/rails into openID
authorKai Krueger <kakrueger@gmail.com>
Sun, 2 May 2010 10:15:13 +0000 (11:15 +0100)
committerKai Krueger <kakrueger@gmail.com>
Sun, 2 May 2010 10:15:13 +0000 (11:15 +0100)
1  2 
config/environment.rb
config/locales/en.yml

Simple merge
Simple merge