From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 20:48:47 +0000 (-0500)
Subject: Merge remote branch 'smcv/trivia'
X-Git-Tag: 3.20100312~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/60fba805e8ecc77e391c8a22db3cdac4adea5756

Merge remote branch 'smcv/trivia'
---

60fba805e8ecc77e391c8a22db3cdac4adea5756