]> 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, 15 Sep 2010 19:38:24 +0000 (15:38 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 15 Sep 2010 19:38:24 +0000 (15:38 -0400)

Trivial merge