]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 5 Aug 2010 21:39:47 +0000 (17:39 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 Aug 2010 21:39:47 +0000 (17:39 -0400)

Trivial merge