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

[Alejandro Perez]

commit 26128732a2e0e7900d73abaf9019ace0da8b76be
Merge: 4e27e1a 7265a27
Author: Alejandro Perez <alejandro.perez.torres at gmail.com>
Date:   Mon Apr 11 17:06:58 2011 -0500

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

 rubygem-sequel.spec |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc rubygem-sequel.spec
index fc12e70,23c9c10..18e8358
--- a/rubygem-sequel.spec
+++ b/rubygem-sequel.spec
@@@ -6,8 -6,8 +6,13 @@@
  
  Summary: The Database Toolkit for Ruby
  Name: rubygem-%{gemname}
++<<<<<<< HEAD
 +Version: 3.20.0
 +Release: 7%{?dist}
++=======
+ Version: 3.19.0
+ Release: 8%{?dist}
++>>>>>>> 7265a27b8306e9473fd991d3fe73fead4b09eefd
  Group: Development/Languages
  License: MIT
  URL: http://sequel.rubyforge.org
@@@ -64,9 -64,10 +69,16 @@@ rm -rf %{buildroot
  %doc %{geminstdir}/doc
  
  %changelog
++<<<<<<< HEAD
 +* Mon Apr 11 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.20.0-7
 +- change version to 3.20.0
 +* Tue Jan 18 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.19.0-6
++=======
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.19.0-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Tue Jan 18 2011 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.19.0-7
++>>>>>>> 7265a27b8306e9473fd991d3fe73fead4b09eefd
  - change version from 3.16.0 to 3.19.0
  
  * Thu Nov 04 2010 Alejandro Pérez <aeperezt at fedoraproject.org> - 3.16.0-6