From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 8 Aug 2009 16:17:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.15~19
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/548ab7a1258c8633cabc69c942470475374c2c0d

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

548ab7a1258c8633cabc69c942470475374c2c0d