From: W. Trevor King <wking@tremily.us>
Date: Sat, 14 Sep 2013 15:44:32 +0000 (-0700)
Subject: Merge branch 'accept-feedparser-encoding-override'
X-Git-Tag: v3.7~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c35fbcc700e172b1f5a3777159b767aac71fc0b7;p=rss2email.git

Merge branch 'accept-feedparser-encoding-override'

* accept-feedparser-encoding-override:
  CHANGELOG: Demote guessed encodings logs from 'error' to 'warning'
  feed: don't emit error if parser able to auto-determine encoding

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

c35fbcc700e172b1f5a3777159b767aac71fc0b7