Merge branch 'master' of https://git.maemo.org/projects/feedingit
authorYves Marcoz <yves@marcoz.org>
Fri, 5 Aug 2011 05:04:12 +0000 (22:04 -0700)
committerYves Marcoz <yves@marcoz.org>
Fri, 5 Aug 2011 05:04:12 +0000 (22:04 -0700)
commit95e5fba240fe1e29b35ab0e5e824e66b4294de25
tree67a3f1cdcc163d38ebe057716f562a69d3a7e596
parent0072e91ea81054dbe1e328b2eb5aa875084732a7
parent66ab58c4ce0e835ce552e6f8937bc359eb7a837c
Merge branch 'master' of https://git.maemo.org/projects/feedingit

Conflicts:
src/rss_sqlite.py
src/FeedingIt-Web.py