Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 21 Feb 2013 07:09:52 +0000 (02:09 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 21 Feb 2013 07:09:52 +0000 (02:09 -0500)

Trivial merge