[siege: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/siege

[Christof Damian]

commit 324fa2f554b432053af9b2ad07787b93eccdc21b
Merge: 966780e 6bdd8c6
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 16:36:33 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/siege
    
    Conflicts:
    	siege.spec

 siege.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc siege.spec
index 703fc50,88b54b9..90a4219
--- a/siege.spec
+++ b/siege.spec
@@@ -79,9 -81,9 +79,12 @@@ rm -rf $RPM_BUILD_ROO
  %config(noreplace) %{_sysconfdir}/siege/siegerc
  
  %changelog
 +* Fri Mar  2 2012 Christof Damian <christof at damian.net> - 2.72-1
 +- upstream 2.72
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.71-3.b3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.71-2.b3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild