]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge remote branch 'remotes/peteg/revert' into revert
authorJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 19:59:45 +0000 (15:59 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Oct 2010 19:59:45 +0000 (15:59 -0400)

Trivial merge