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>

diff --cc CHANGELOG
index a14f2a340b2cea927cc1e772ffe93fc308e7ac8b,0409ba8a45c7be8920dd658beeb4a458ed5c98bf..5f1e7b7bbb4e059772f6a0c2131aad990dc7ca3a
--- 1/CHANGELOG
--- 2/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.

diff --cc rss2email/feed.py
Simple merge