]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote branch 'smcv/ready/sslcookie-auto'
authorJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 20:31:25 +0000 (16:31 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 29 Nov 2010 20:31:25 +0000 (16:31 -0400)
1  2 
IkiWiki/CGI.pm

diff --cc IkiWiki/CGI.pm
Simple merge