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-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/1513404600bcff6bfc003d78b844ab097a2e3355?hp=1513404600bcff6bfc003d78b844ab097a2e3355;ds=sidebyside

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