From: Joey Hess <joey@kitenet.net>
Date: Mon, 29 Nov 2010 20:31:25 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/sslcookie-auto'
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/3697a684df0f9bf931fafb3cd7766753b47c1970

Merge remote branch 'smcv/ready/sslcookie-auto'
---

3697a684df0f9bf931fafb3cd7766753b47c1970