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)
commitc35fbcc700e172b1f5a3777159b767aac71fc0b7
tree290431bb09f89139b6dab521d1ba50e525dfdb9d
parent50fc0e003af0cf4cd96faf8def278de8e11fed73
parent808d426b507004bf7ae4de0b0ccb4ac21f068c4a
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>