]> 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>
Sat, 18 Oct 2008 16:48:10 +0000 (12:48 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 18 Oct 2008 16:48:10 +0000 (12:48 -0400)

Trivial merge