From: Joey Hess <joey@kitenet.net>
Date: Sun, 21 Jul 2013 17:51:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'schmonz/fancypodcast'
X-Git-Tag: 3.20130904~88
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4c88a4d9d8fb62e8e4bea068a2546059bd1fa306

Merge remote-tracking branch 'schmonz/fancypodcast'
---

4c88a4d9d8fb62e8e4bea068a2546059bd1fa306