]> 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>
Fri, 20 Jun 2008 23:41:24 +0000 (19:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 20 Jun 2008 23:41:24 +0000 (19:41 -0400)

Trivial merge