]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 25 Feb 2011 18:56:16 +0000 (14:56 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 25 Feb 2011 18:56:16 +0000 (14:56 -0400)

Trivial merge