From: Joey Hess <joey@kitenet.net>
Date: Mon, 11 Oct 2010 15:41:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101019~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c321f5406b29e29b6ff61ab9e291a24d68e9d824?hp=c321f5406b29e29b6ff61ab9e291a24d68e9d824

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