From: Joey Hess <joey@kitenet.net>
Date: Sun, 21 Jul 2013 17:51:57 +0000 (-0400)
Subject: merge schmonz/fancypodcast
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/0db80d453fad3fbf9ae04a18b7b6051926b2dd3e

merge schmonz/fancypodcast
---

diff --git a/debian/changelog b/debian/changelog
index bc05aa091..81931465a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,13 @@ ikiwiki (3.20130712) UNRELEASED; urgency=low
 
   * calendar: Display the popup mouseover when there is only 1 page for a
     given day, for better UI consistency.
+  * meta: Can now be used to add an enclosure to a page, which is a fancier
+    way to do podcasting than just inlining the media files directly;
+    this way you can write a post about the podcast episode with show notes,
+    author information, etc.
+    (schmonz)
+  * aggregate: Show author in addition to feedname, if different.
+    (schmonz)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 19 Jul 2013 18:53:23 -0400
 
diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn
index 79b214049..04d86823c 100644
--- a/doc/todo/fancypodcast.mdwn
+++ b/doc/todo/fancypodcast.mdwn
@@ -346,3 +346,7 @@ Does this added tag provide any benefits? --[[Joey]]
 > than the atom namespace bits. --[[schmonz]]
 
 >> Sounds ok then. --[[Joey]]
+
+----
+
+[[merged|done]] --[[Joey]]