From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Sep 2011 15:09:24 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111106~75
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/225a557b10de7ddf0ad1706326db7dfc2ed703e3?hp=225a557b10de7ddf0ad1706326db7dfc2ed703e3

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