Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Sat, 23 Oct 2010 11:00:40 +0000 (12:00 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 23 Oct 2010 11:00:40 +0000 (12:00 +0100)
commit58653f8b9d90c9f0a2f44d026b0ec84574f6bc9a
tree12f26992e46fccfb1b5760c7111662f850832802
parente09b187cae178c000a683635d408cab72dc3d35b
parent68a65a9256610d1888b3108c3e598bf23d84fd7c
Merge branch 'master' into openid
config/locales/is.yml