]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 18 Nov 2007 22:24:01 +0000 (17:24 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 18 Nov 2007 22:24:01 +0000 (17:24 -0500)

Trivial merge