From: Dave Cross <dave@dave.org.uk>
Date: Fri, 4 Jan 2013 06:46:08 +0000 (+0000)
Subject: Merge branch 'master' of github.com:davorg/xml-feed
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FXML-Feed.git;a=commitdiff_plain;h=0fe62009bcf4bef894c16b21c2fb9afd896f980b

Merge branch 'master' of github.com:davorg/xml-feed

Conflicts:
	Changes
---

0fe62009bcf4bef894c16b21c2fb9afd896f980b
diff --cc Changes
index 902141d,b8d94be..3949756
--- a/Changes
+++ b/Changes
@@@ -1,18 -1,40 +1,33 @@@
 +2012-07-10  Dave Cross <dave@dave.org.uk>
  
+   * Change the User Agent to identify as XML::Feed  (SZABGAB)
+     as two sites refused to server the default user agent:
+       http://code.foo.no/feed gave 'Bad Behavior'
+       http://thorsen.pm/atom gave 'Forbidden'
+ 
+ 2012-04-10  Jakob Voss <voss@gbv.de>
+ 
+   * Add support for RFC 5005 Feed Paging and Archiving in Atom feeds
+ 
+ 2012-04-05  Dave Cross <dave@dave.org.uk>
+ 
+   * lib/XML/Feed.pm: Remove svn tag.
+ 
+   * lib/XML/Feed.pm: Changed contact details from non-working 6A email address.
+ 
 -2012-03-28  sockmonk <wes.sheldahl@gmail.com>
 +  * lib/XML/Feed.pm, lib/XML/Feed/Format/Atom.pm, lib/XML/Feed/Format/RSS.pm:
 +  Added an image() method to Feed objects. Does something useful for RSS feeds;
 +  not for Atom feeds currently.
  
 -  * README: Updated README file with current and tested installation
 -  instructions.  Hoping to clarify the confusion reflected in RT # 53884, maybe
 -  even resolve it.  https://rt.cpan.org/Public/Bug/Display.html?id=53884
 -
 -2012-03-12  Dave Cross <dave@dave.org.uk>
 -
 -  * lib/XML/Feed.pm: Bump version for release.
 -
 -  * t/07-atom10-create.t: Fixed broken date test.
 -
 -  * lib/XML/Feed/Entry/Format/Atom.pm: Applying the missing bit of the patch
 -  from https://rt.cpan.org/Ticket/Display.html?id=20763
 +2012-04-10  Jakob Voss <voss@gbv.de>
  
 -2012-03-10  Dave Cross <dave@dave.org.uk>
 +  * Changes, lib/XML/Feed.pm, lib/XML/Feed/Format/Atom.pm,
 +  lib/XML/Feed/Format/RSS.pm, t/02-create.t: Add support for RFC 5005 Feed
 +  Paging and Archiving in Atom feeds
  
 -  * lib/XML/Feed.pm: Bump version number for release.
 +2012-04-06  Dave Cross <dave@dave.org.uk>
  
 -  * Build.PL: Increase XML::Atom dependency to 0.37 - see
 -  https://rt.cpan.org/Ticket/Display.html?id=74703
 +  * Changes, lib/XML/Feed.pm: Bump version for release.
  
  2012-03-06  Gabor Szabo <szabgab@gmail.com>