Merge branch 'catch-html-parse-error'
authorW. Trevor King <wking@tremily.us>
Fri, 11 Oct 2013 15:02:48 +0000 (08:02 -0700)
committerW. Trevor King <wking@tremily.us>
Fri, 11 Oct 2013 15:02:48 +0000 (08:02 -0700)
commitd84bc04899f8644821e5bf99aa432d7f00e48d79
tree0514290098c2cc17069b2e63c34ed282a26357bd
parent663e562a4b72d8480abdbada0a45fd9b62295f3d
parentb376e423d5b1a25c473d4ab2f936e78f65fe34b4
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>
CHANGELOG
rss2email/feed.py