]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 18 Mar 2012 18:01:15 +0000 (14:01 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 18 Mar 2012 18:01:15 +0000 (14:01 -0400)

Trivial merge