]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 28 Nov 2008 16:53:35 +0000 (08:53 -0800)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 28 Nov 2008 16:53:35 +0000 (08:53 -0800)

Trivial merge