From: Joey Hess <joey@kitenet.net>
Date: Sun, 30 Oct 2011 16:23:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111106~22
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3aa41021ad4aa4361b44663fd8dbb1a7dbea72e0?hp=3aa41021ad4aa4361b44663fd8dbb1a7dbea72e0

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