From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 23 Dec 2008 00:00:38 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.72~19
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/62c0ba3619056cfb67edf426f7f5db59d6d56bb9

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

62c0ba3619056cfb67edf426f7f5db59d6d56bb9