]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 26 Nov 2008 18:04:28 +0000 (13:04 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 26 Nov 2008 18:04:28 +0000 (13:04 -0500)

Trivial merge