]> 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, 14 Mar 2010 00:08:24 +0000 (19:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 00:08:24 +0000 (19:08 -0500)

Trivial merge