]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 29 May 2012 17:43:37 +0000 (13:43 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 29 May 2012 17:43:37 +0000 (13:43 -0400)

Trivial merge