From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Fri, 22 Feb 2013 20:05:34 +0000 (-0500)
Subject: Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast
X-Git-Tag: 3.20130904~88^2~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a1ec9f8e2772c2cb74f15d835f89d40d1aee2baa?hp=-c

Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast
---

a1ec9f8e2772c2cb74f15d835f89d40d1aee2baa