Merge branch 'format-entry-name'

* format-entry-name:
  feed: Give defaults for _get_entry_name formatting data
  feed: Convert 'friendly-name' setting to 'name-format'

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

diff --cc CHANGELOG
index 82fa9a288b663262872cd68c2510a8ff4372ac11,2cd8b6869d6a5233af0954b320fdccdaee0b2c1c..a9a11d62d6ddef5e80f60f163704a964bad545b7
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -1,5 -1,5 +1,6 @@@
  v3.7 (unreleased)
+     * 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