From: Yves Marcoz <yves@marcoz.org>
Date: Fri, 6 Jan 2012 00:20:50 +0000 (-0800)
Subject: Merge branch 'master' of https://git.maemo.org/projects/feedingit
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=47a801727a2c1379cfbef49e486bed11de6e3e70;p=feedingit

Merge branch 'master' of https://git.maemo.org/projects/feedingit

Conflicts:
	debian/changelog
---

47a801727a2c1379cfbef49e486bed11de6e3e70
diff --cc debian/changelog
index c97370c,817e28b..6ae786d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,14 @@@
+ feedingit (0.9.1-6) stable; urgency=low
+ 
+   * Fixed date bug for some feeds
+ 
+  -- Yves <yves@marcoz.org>  Thu, 29 Dec 2011 21:51:19 -0800
+ 
 +feedingit (0.9.1-5) stable; urgency=low
 +
 +  * Fixed bugs for automatic update and settings
 +
 + -- Yves <yves@marcoz.org>  Wed, 28 Dec 2011 21:51:19 -0800
  
  feedingit (0.9.1-4) stable; urgency=low