From: Joey Hess <joey@kitenet.net>
Date: Fri, 13 Jun 2014 15:11:19 +0000 (-0400)
Subject: add news item for ikiwiki 3.20140613
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c0139a31d438d99db67cbcbd5c7ca1402e334f90

add news item for ikiwiki 3.20140613
---

diff --git a/doc/news/version_3.20130904.mdwn b/doc/news/version_3.20130904.mdwn
deleted file mode 100644
index c5b65d5ac..000000000
--- a/doc/news/version_3.20130904.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-ikiwiki 3.20130904 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * 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)
-   * Consistently configure LWP::UserAgent to allow use of http\_proxy
-     and no\_proxy environment variables, as well as ~/.ikiwiki/cookies
-     (schmonz)
-   * Fix test suite to work with perl 5.18. Closes: #[719969](http://bugs.debian.org/719969)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20140613.mdwn b/doc/news/version_3.20140613.mdwn
new file mode 100644
index 000000000..ab9940a96
--- /dev/null
+++ b/doc/news/version_3.20140613.mdwn
@@ -0,0 +1,5 @@
+ikiwiki 3.20140613 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * only\_committed\_changes could fail in a git repository merged
+     with git merge -s ours.
+   * Remove google from openid selector, per http://xkcd.com/1361/"""]]
\ No newline at end of file