From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 17 Jul 2013 20:49:46 +0000 (-0400)
Subject: Merge branch 'master' into fancypodcast
X-Git-Tag: 3.20130904~88^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5c0a18e75a5bf9d6ce9da3a1a525117fe9ee8e47?hp=-c

Merge branch 'master' into fancypodcast

Conflicts:
	doc/todo/fancypodcast.mdwn
---

5c0a18e75a5bf9d6ce9da3a1a525117fe9ee8e47