# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1314171550 -7200
# Node ID e927c6910c387e3d45eca17b0b067d5a441a95c5
# Parent  2642c8d89bdc5bc8506fd1e3a01dc0f0855c8e88# Parent  2cd30af937fa0e4df0d588e37b9ac31647b1a877
Automated merge with https://xanthippe.dyndns.org/hg/Feedworm

diff -r 2cd30af937fa -r e927c6910c38 TODO.txt
--- a/TODO.txt	Tue Aug 23 16:02:35 2011 +0200
+++ b/TODO.txt	Wed Aug 24 09:39:10 2011 +0200
@@ -6,4 +6,6 @@
 
 - investigate caching features of sqlalchemy to avoid round trips to the DB. Alternatively, implement caching of Feeds with their FeedEntries manually
 
-- feedparser uses the proxy for getting the feeds
\ No newline at end of file
+- feedparser uses the proxy for getting the feeds
+
+- check if couchdb python lib supports Py3k, continue work on Py3k branch