]> 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>
Wed, 2 Jan 2008 01:12:41 +0000 (20:12 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 01:12:41 +0000 (20:12 -0500)

Trivial merge