From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 21 Feb 2013 07:09:52 +0000 (-0500)
Subject: Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast
X-Git-Tag: 3.20130904~88^2~19
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4f25efaff3aadd672ac0c10b7f15f70899a1da4f?hp=e9f9a63739cb79196ea0c231f09ab844f0665145

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