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)
commit9fbd888e04e545bf61789973b1ed5b457e2b1be9
treee7d32e0b2e34bb507ff8793a5dd5748f73af5ed2
parent92af0eccd59af0138b161f0aa841576221a40428
parent4d1fa7adfbd169187b6e872146925fc14535a11c
Merge branch 'master' of git://git.openstreetmap.org/rails into openID
config/environment.rb
config/locales/en.yml