From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 14 Jul 2008 17:42:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.54~99^2~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5acfbb50aab538ac43bccb55ba2427cbffa26f0d

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

5acfbb50aab538ac43bccb55ba2427cbffa26f0d