[rubygem-dynect_rest/f20: 2/5] Merge branch 'master' into f20

[Russell Harrison]

commit 778902cfa68f55e809058cdad18ac482979b2cbb
Merge: 2867a46 02efba3
Author: Russell Harrison <rharrison at fedoraproject.org>
Date:   Tue Aug 27 15:45:31 2013 -0400

    Merge branch 'master' into f20
    
    Conflicts:
    	rubygem-dynect_rest.spec

 dynect_rest-fix_redirect_handling.patch |   26 ++++++++++++++++++++++++++
 rubygem-dynect_rest.spec                |    8 +++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --cc rubygem-dynect_rest.spec
index 8a39ec8,130cc50..14bb3ed
--- a/rubygem-dynect_rest.spec
+++ b/rubygem-dynect_rest.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           rubygem-%{gem_name}
  Version:        0.4.3
--Release:        6%{?dist}
++Release:        7%{?dist}
  Summary:        Dynect REST API library
  
  Group:          Development/Languages
@@@ -91,9 -94,9 +94,12 @@@ rm -f %{buildroot}%{gem_instdir}/.rspe
  %doc %{gem_instdir}/VERSION
  
  %changelog
 -* Tue Aug 27 2013 Russell Harrison <rharrison at fedoraproject.org> 0.4.3-6
++* Tue Aug 27 2013 Russell Harrison <rharrison at fedoraproject.org> 0.4.3-7
+ - Patch to fix redirect handling during long API calls.
+ 
 +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.3-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 +
  * Thu Mar 14 2013 Russell Harrison <rharrison at fedoraproject.org> 0.4.3-5
  - Update for Ruby 2.0 in F19+