From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 17:52:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100312~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3fd202db7b3b3ea4eb8fc7ecda8db38f8ed788af?hp=3fd202db7b3b3ea4eb8fc7ecda8db38f8ed788af

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