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)
commitc4cb6e3c346199929b42ab0c352e33b36f55b72e
treecba4f09fe958a0f1803375f15824cf36459c0267
parente14ae160de665c32ff3858746baaad1504292ddf
parent1d3b2674c87c9cac395228dac9b60c751d4e06a1
Merge remote-tracking branch 'remotes/smcv/ready/openid'