Merge remote-tracking branch 'remotes/smcv/ready/openid'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:24:15 +0000 (14:24 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:24:15 +0000 (14:24 -0400)

Trivial merge