Merge commit '95b2b55820745606cc7dae2df4fbbb214eeb161c'
authorYves Marcoz <yves@marcoz.org>
Sun, 27 Nov 2011 18:43:13 +0000 (10:43 -0800)
committerYves Marcoz <yves@marcoz.org>
Sun, 27 Nov 2011 18:43:13 +0000 (10:43 -0800)
1  2 
src/rss_sqlite.py

Simple merge