]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 00:49:37 +0000 (19:49 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 00:49:37 +0000 (19:49 -0500)

Trivial merge