]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 28 Jan 2013 21:09:32 +0000 (08:09 +1100)
committerJoey Hess <joey@kitenet.net>
Mon, 28 Jan 2013 21:09:32 +0000 (08:09 +1100)

Trivial merge