Merge branch 'trustlink'

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

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

diff --cc CHANGELOG
index be094785bb2d3e373b3ff18315ce0fd0cd6ce694,a866fa63f27b09d8e64ceae2af2575224e937da9..62646af33f26f64b7b715c901a009d68723f6eb0
--- 1/CHANGELOG
--- 2/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.
  

diff --cc README
Simple merge