Merge branch 'master' into openID
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Apr 2010 20:03:03 +0000 (20:03 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Apr 2010 20:03:03 +0000 (20:03 +0000)
commitf699368335694f663755c7f714a1ac358bc679cb
tree3b8fdd1062be4befaa40aca2e175789e317d3f98
parentf28f28f24a61ce4a8956c220f04df5980d4dbd65
parentfeb9582b071d6eb44bcc6fbc027049dd1f5c2042
Merge branch 'master' into openID
config/locales/en.yml