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

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