From: Joey Hess <joey@kitenet.net>
Date: Wed, 10 Jul 2013 21:08:02 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130710~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d932d5ab00885a9f7bab7644d75a38ad9a4dc48b?ds=inline;hp=d932d5ab00885a9f7bab7644d75a38ad9a4dc48b

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