From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 21 Jul 2008 21:05:40 +0000 (-0400)
Subject: Merge commit 'smcv/master'
X-Git-Tag: 2.55~87^2~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/edfe8693814ef48426dc35fa76cdd145871fbc96

Merge commit 'smcv/master'
---

edfe8693814ef48426dc35fa76cdd145871fbc96