From: Joey Hess <joey@kitenet.net>
Date: Mon, 4 Oct 2010 19:59:45 +0000 (-0400)
Subject: Merge remote branch 'remotes/peteg/revert' into revert
X-Git-Tag: 3.20101019~19^2~31
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/252e3f600670040b2a184e5ca0581db720096a80?hp=-c

Merge remote branch 'remotes/peteg/revert' into revert
---

252e3f600670040b2a184e5ca0581db720096a80