projects / rss2email.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f73173 4823b2a)
Merge Lindsey's v2.71 into my v2.71
authorW. Trevor King <wking@tremily.us>
Mon, 12 Nov 2012 19:47:06 +0000 (14:47 -0500)
committerW. Trevor King <wking@tremily.us>
Mon, 12 Nov 2012 19:47:06 +0000 (14:47 -0500)
commitd33eef1cb7cd8fd1b53df0cc5f379758555f3c0e
tree82d77d4d9bd7d0000426497eccfb5a7c2c6c5f45tree | snapshot
parent8f73173c67d4e979b697ff67b4614f8e59abf5b8commit | diff
parent4823b2a862650f6a28cfde3e52b1df7991b3faaecommit | diff
Merge Lindsey's v2.71 into my v2.71

I would just use Lindsey's repository directly, except my repository
contains more old releases (back to v2.65).

The conflicts were due to a few new lines in Lindsey's CHANGELOG, and
a number of whitespace differences due to line endings.

Conflicts:
CHANGELOG
config.py.example
r2e
r2e.bat
readme.html
rss2email.py
CHANGELOG diff1 | diff2 | blob | history
readme.html diff1 | diff2 | blob | history
Python script for converting RSS newsfeeds to email