Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 20 Feb 2013 14:21:24 +0000 (09:21 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 20 Feb 2013 14:21:24 +0000 (09:21 -0500)

Trivial merge