From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 01:25:04 +0000 (-0400)
Subject: Merge branch 'master' into openidselector
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/a4b432f543089b23f6a2fee8c8a58e17b23894fe

Merge branch 'master' into openidselector
---

a4b432f543089b23f6a2fee8c8a58e17b23894fe