From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 12 Jul 2008 16:02:57 +0000 (-0400)
Subject: Merge commit 'smcv/master'
X-Git-Tag: 2.54~113
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f707d62481052a3cba1396a681f206d9e66f67ef

Merge commit 'smcv/master'
---

f707d62481052a3cba1396a681f206d9e66f67ef