From: Joey Hess <joey@kitenet.net>
Date: Thu, 16 Aug 2012 23:44:54 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c137ef31026a5de929251f6c5a747df5ac24763d?hp=-c

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

c137ef31026a5de929251f6c5a747df5ac24763d