]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 11 May 2012 04:19:06 +0000 (00:19 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 11 May 2012 04:19:06 +0000 (00:19 -0400)

Trivial merge