From: Joey Hess <joey@kitenet.net>
Date: Fri, 3 Feb 2012 02:43:25 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120203~187
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7?ds=inline;hp=7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7

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