Merge branch 'format-entry-name'
authorW. Trevor King <wking@tremily.us>
Sat, 14 Sep 2013 16:57:12 +0000 (09:57 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 14 Sep 2013 16:57:12 +0000 (09:57 -0700)
commit668438e1845511665a2f4365da0069b1c255553a
tree747e0f05587c8a8f28add6fbfa6ba3dc33593dbd
parent91ff6e3b83978bd9c1f1608e0a7962e3996ed14a
parent1ae05a019f26cbac0a1dcc737249e44f04e224fb
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>
CHANGELOG
rss2email/feed.py