From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 01:25:04 +0000 (-0400)
Subject: Merge branch 'master' into openidselector
X-Git-Tag: 3.20100515~63^2~9
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=a4b432f543089b23f6a2fee8c8a58e17b23894fe

Merge branch 'master' into openidselector
---

a4b432f543089b23f6a2fee8c8a58e17b23894fe