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)
commit1ae014afa1e9cb79abea820610beea1bcf66b99c
treefc40cbe9f9ae0d6584f825af98fa145249aa9358
parent5dcd2ad70c5006d1b33838274b9a9167c81cfc90
parentf8119bf169e851c10bbf82a14e61dfc481b6d59b
Merge branch 'master' of git://git.openstreetmap.org/rails
config/locales/is.yml