From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 18:24:15 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/smcv/ready/openid'
X-Git-Tag: debian/3.20140227~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c4cb6e3c346199929b42ab0c352e33b36f55b72e

Merge remote-tracking branch 'remotes/smcv/ready/openid'
---

c4cb6e3c346199929b42ab0c352e33b36f55b72e