]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 16:38:19 +0000 (12:38 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Sep 2008 16:38:19 +0000 (12:38 -0400)

Trivial merge