]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 23 Jan 2012 22:16:26 +0000 (18:16 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 23 Jan 2012 22:16:26 +0000 (18:16 -0400)

Trivial merge