From: W. Trevor King <wking@tremily.us>
Date: Fri, 11 Oct 2013 15:02:48 +0000 (-0700)
Subject: Merge branch 'catch-html-parse-error'
X-Git-Tag: v3.7~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d84bc04899f8644821e5bf99aa432d7f00e48d79;p=rss2email.git

Merge branch 'catch-html-parse-error'

* catch-html-parse-error:
  CHANGELOG: Document this branch's HTML-title conversion fallback
  feed: Add 'default' argument to Feed._html2text for HTMLParseError

Signed-off-by: W. Trevor King <wking@tremily.us>
---

d84bc04899f8644821e5bf99aa432d7f00e48d79
diff --cc CHANGELOG
index a14f2a3,0409ba8..5f1e7b7
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,7 -1,5 +1,8 @@@
  v3.7 (unreleased)
+     * Fix fallback for titles that contain malformed HTML.
 +    * Fix atomic saves to avoid garbling config and data files if the disk is full.
 +    * Convert the `friendly-name` boolean to the new `name-format` setting.  This allow users to customize how the friendly name is constructed.
 +    * Demote guessed encodings logs from 'error' to 'warning'.
  
  v3.6 (2013-09-09)
      * Fix missing port argument for IMAPAuthenticationError.