Merge branch 'accept-feedparser-encoding-override'
authorW. Trevor King <wking@tremily.us>
Sat, 14 Sep 2013 15:44:32 +0000 (08:44 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 14 Sep 2013 15:44:32 +0000 (08:44 -0700)
* 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>

Trivial merge