Merge branch 'openID' of git://github.com/avar/osm-website into openID
authorKai Krueger <kai@aiputerlx.(none)>
Tue, 27 Apr 2010 20:37:40 +0000 (21:37 +0100)
committerKai Krueger <kai@aiputerlx.(none)>
Tue, 27 Apr 2010 20:37:40 +0000 (21:37 +0100)
commit8df391f41f3be43866e655dae5c6a52c7c0a2aa6
tree867053689e0e515bc44ab5fa3932155fe67aef4e
parent5027a70fec6052227b3b0d77c03d9a58462b2c97
parent79e140641c1b73a2776f28d4a3bfc9cfc5ef0401
Merge branch 'openID' of git://github.com/avar/osm-website into openID