Merge branch 'patch5884'
authorYves Marcoz <yves@marcoz.org>
Tue, 15 Jun 2010 03:12:27 +0000 (20:12 -0700)
committerYves Marcoz <yves@marcoz.org>
Tue, 15 Jun 2010 03:12:27 +0000 (20:12 -0700)
commit5d996ad86f81bd3f50f2f241acaa1ef6d2d5ef96
tree33289448dab9715a5188543ac0ad06888b8b86cd
parentf63dde0ff90f530a147839dc165217efd250bbb0
parent90b57ce679759382b19ef9bc3ecc21a0418739b7
Merge branch 'patch5884'

Conflicts:
src/config.py
src/FeedingIt.py
src/config.py
src/rss.py