From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 31 Jul 2008 22:49:47 +0000 (-0400)
Subject: Merge commit 'smcv/escape-feed-html'
X-Git-Tag: 2.56~5
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2f33f294d95def3c50a467c5b5b9c5f5cae9e5fb

Merge commit 'smcv/escape-feed-html'
---

2f33f294d95def3c50a467c5b5b9c5f5cae9e5fb