iMerge branch 'master' of /home/chrissi/git/zs - zs - Zeitungsschau rss to email converter	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
1Log	/scm/zs//log.gph	gopher.r-36.net	70
1Files	/scm/zs//files.gph	gopher.r-36.net	70
1Refs	/scm/zs//refs.gph	gopher.r-36.net	70
1LICENSE	/scm/zs//file/LICENSE.gph	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1commit 12f2f413caba174fb8c631993d2348cd2b11f08c	/scm/zs//commit/12f2f413caba174fb8c631993d2348cd2b11f08c.gph	gopher.r-36.net	70
1parent 4367ca12c328ba46f3870016280e39c0ef252a0b	/scm/zs//commit/4367ca12c328ba46f3870016280e39c0ef252a0b.gph	gopher.r-36.net	70
hAuthor: Christoph Lohmann <20h@r-36.net>	URL:mailto:20h@r-36.net	gopher.r-36.net	70
iDate:   Fri,  2 Oct 2015 17:00:25 +0200	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iMerge branch 'master' of /home/chrissi/git/zs	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iDiffstat:	Err	gopher.r-36.net	70
i  README.md                           |      20 ++++++++++++--------	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
i1 file changed, 12 insertions(+), 8 deletions(-)	Err	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1diff --git a/README.md b/README.md	/scm/zs//file/README.md.gph	gopher.r-36.net	70
i@@ -39,10 +39,6 @@ filtering to specific mailboxes:	Err	gopher.r-36.net	70
i         X-RSS-ID        (article ID)	Err	gopher.r-36.net	70
i         X-RSS-TAGS        (provided tags in the article or feed)	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i-## Repetitive run for cron	Err	gopher.r-36.net	70
i-	Err	gopher.r-36.net	70
i-        zs run >/dev/null	Err	gopher.r-36.net	70
i-	Err	gopher.r-36.net	70
i ## Import your old feeds from OPML	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         zs opmlimport file.opml	Err	gopher.r-36.net	70
i@@ -51,10 +47,18 @@ filtering to specific mailboxes:	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i         zs opmlexport myfeeds.opml	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i-This  will  output  the stderr to cron and mail it to you. Zeitungsschau	Err	gopher.r-36.net	70
i-ist written in a conservative way to only handle  the  important  excep‐	Err	gopher.r-36.net	70
i-ttions  which are needed. The complexity of Python makes it impossible to	Err	gopher.r-36.net	70
i-know all cases beforehand.	Err	gopher.r-36.net	70
i+## Repetitive run for cron	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i+        zs run >/dev/null	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i+This  will  output  the stderr to cron and mail it to you.	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i+## Exceptions // Bugs	Err	gopher.r-36.net	70
i+	Err	gopher.r-36.net	70
i+Zeitungsschau ist written in a conservative way to only handle  the  im‐	Err	gopher.r-36.net	70
i+portant  exceptions  which are needed. The complexity of  Python   makes	Err	gopher.r-36.net	70
i+it  impossible  to  know all cases beforehand. Please send in patches in	Err	gopher.r-36.net	70
i+case you find bugs.	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i Please report bugs to 20h@r-36.net.	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
.