]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 13 Nov 2009 22:30:59 +0000 (17:30 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 13 Nov 2009 22:30:59 +0000 (17:30 -0500)

Trivial merge