]> 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>
Wed, 29 Oct 2008 17:37:45 +0000 (13:37 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 29 Oct 2008 17:37:45 +0000 (13:37 -0400)

Trivial merge