Merge branch 'master' of git://git.openstreetmap.org/rails
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)
1  2 
config/locales/is.yml

Simple merge