From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 18:45:38 +0000 (-0400)
Subject: Merge commit 'smcv/ready/trivia'
X-Git-Tag: 3.1415926~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1513404600bcff6bfc003d78b844ab097a2e3355;p=ikiwiki.git

Merge commit 'smcv/ready/trivia'
---

1513404600bcff6bfc003d78b844ab097a2e3355