From: W. Trevor King <wking@tremily.us>
Date: Sat, 18 Jan 2014 19:58:49 +0000 (-0800)
Subject: Merge branch 'trustlink'
X-Git-Tag: v3.9~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b472e72df2f0f830e6f36fd090b1ea9cb339b3a8;p=rss2email.git

Merge branch 'trustlink'

* trustlink:
  CHANGELOG: Document this branch
  config and feed: Added trust-link preference

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

b472e72df2f0f830e6f36fd090b1ea9cb339b3a8
diff --cc CHANGELOG
index be09478,a866fa6..62646af
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,4 -1,5 +1,7 @@@
 -v3.8 (unreleased)
++v3.9 (unreleased)
+     * Add a new `trust-link` setting, to prefer the `link` attribute over the `id` attribute for identifying entries.
++
 +v3.8 (2014-01-18)
      * Sluggify feed names on opmlimport.
      * Allow Unicode letters and digits in feed names, instead of just ASCII lettters and digits.