[rubygem-aws: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/rubygem-aws

[Michal Fojtik]

commit 9be55aea8c3415b8798b1840b5a121737da129e2
Merge: 1e23b21 a627b37
Author: Michal Fojtik <mi at mifo.sk>
Date:   Tue Mar 29 14:20:09 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rubygem-aws
    
    Conflicts:
    	rubygem-aws.spec

 rubygem-aws.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc rubygem-aws.spec
index a1ea142,f0ec2d3..fa0cf7b
--- a/rubygem-aws.spec
+++ b/rubygem-aws.spec
@@@ -4,8 -4,8 +4,13 @@@
  
  Summary: Ruby gem for all Amazon Web Services
  Name: rubygem-%{gemname}
++<<<<<<< HEAD
 +Version: 2.4.5
 +Release: 1%{?dist}
++=======
+ Version: 2.4.2
+ Release: 2%{?dist}
++>>>>>>> a627b37204788a28b3ac0a9c06d87c4925d3f872
  Group: Development/Languages
  License: MIT
  URL: http://github.com/appoxy/aws
@@@ -53,9 -54,8 +58,14 @@@ rm -rf %{buildroot
  %doc %{gemdir}/doc/%{gemname}-%{version}
  
  %changelog
++<<<<<<< HEAD
 +* Fri Feb 04 2011 Michal Fojtik <mfojtik at redhat.com> - 2.4.5-1
 +- Version bump
 +- Dropped activesupport
++=======
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++>>>>>>> a627b37204788a28b3ac0a9c06d87c4925d3f872
  
  * Fri Feb 04 2011 Michal Fojtik <mfojtik at redhat.com> - 2.4.2-1
  - Version bump