From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Jan 2012 19:15:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120202~17
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c22f316ae153af4dba1a8a09ee743807d636bace?ds=sidebyside;hp=--cc

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

c22f316ae153af4dba1a8a09ee743807d636bace