]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 20:19:11 +0000 (16:19 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 20:19:11 +0000 (16:19 -0400)

Trivial merge