]> 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>
Sun, 11 Jan 2009 19:28:25 +0000 (14:28 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Jan 2009 19:28:25 +0000 (14:28 -0500)

Trivial merge