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

Trivial merge