Merge branch 'master' into openid
authorTom Hughes <tom@compton.nu>
Mon, 7 Jun 2010 21:24:24 +0000 (22:24 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 7 Jun 2010 21:24:24 +0000 (22:24 +0100)
commitdc35b597a2210d77e3d3e6996138dfdeb3add4a3
tree0bb36a87aa21002fa491603135c8909683731517
parent403121334af3140667709e25fdb8fd6fbac53735
parent406b46e49b786fab879286d77735b2a16c1cfcc5
Merge branch 'master' into openid

Conflicts:
config/locales/is.yml
config/locales/en.yml
config/locales/is.yml