git.maemo.org Git - feedingit/commitdiff

projects / feedingit / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0072e91 66ab58c)

author	Yves Marcoz <yves@marcoz.org>
	Fri, 5 Aug 2011 05:04:12 +0000 (22:04 -0700)
committer	Yves Marcoz <yves@marcoz.org>
	Fri, 5 Aug 2011 05:04:12 +0000 (22:04 -0700)

Conflicts:
src/rss_sqlite.py

		1	2
src/FeedingIt-Web.py	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

Unnamed repository; edit this file to name it for gitweb.