From: Joey Hess <joey@kitenet.net>
Date: Wed, 14 Dec 2011 21:01:21 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111229~58
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fbedf85587d632976071788dec9de374494480fb?hp=-c

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

fbedf85587d632976071788dec9de374494480fb