From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 20 Feb 2013 14:21:24 +0000 (-0500)
Subject: Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast
X-Git-Tag: 3.20130904~88^2~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a25be893e426195fc5672ed7d882defe1b42a1be

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

a25be893e426195fc5672ed7d882defe1b42a1be