Merge commit 'smcv/openid' into ignore
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 02:22:14 +0000 (22:22 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 28 Aug 2009 02:22:14 +0000 (22:22 -0400)

Trivial merge