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

[Michal Fojtik]

commit fc7b7afd42c903c8cbe83bea029d2eb0ef64a900
Merge: 9cc9e7d 339c9a7
Author: Michal Fojtik <mfojtik at redhat.com>
Date:   Tue Mar 1 14:52:12 2011 +0100

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

 rubygem-thin.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc rubygem-thin.spec
index 65f649c,9bd1530..238e848
--- a/rubygem-thin.spec
+++ b/rubygem-thin.spec
@@@ -135,9 -120,9 +135,12 @@@ rm -rf %{buildroot
  %{geminstdir}/lib/thin/stats.html.erb
  
  %changelog
 +* Tue Mar 01 2011 Michal Fojtik <mfojtik at redhat.com> - 1.2.8-1
 +- Updated to upstream version
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.7-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Wed Sep 08 2010 Michal Fojtik <mfojtik at redhat.com> - 1.2.7-1
  - Updated to upstream version