From: Joey Hess <joey@kitenet.net>
Date: Mon, 23 Jan 2012 22:16:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120202~53
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0376a8da8ac42a4c7da4acfd588767ff8e062364?hp=0376a8da8ac42a4c7da4acfd588767ff8e062364

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