Merge remote-tracking branch 'schmonz/fancypodcast'
authorJoey Hess <joey@kitenet.net>
Sun, 21 Jul 2013 17:51:35 +0000 (13:51 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 21 Jul 2013 17:51:35 +0000 (13:51 -0400)

Trivial merge