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

[Jan Kaluža]

commit 15adf71d558d777208162d29ee42a66902c4083e
Merge: d5363b3 e404807
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Mon Jul 23 10:40:46 2012 +0200

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

 mod_bw.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc mod_bw.spec
index a2fd7d6,bc2ddb3..8c6a6a6
--- a/mod_bw.spec
+++ b/mod_bw.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:           mod_bw
  Version:        0.8
--Release:        9%{?dist}
++Release:        10%{?dist}
  Summary:        Bandwidth Limiter For Apache
  
  Group:          System Environment/Daemons
@@@ -54,9 -54,9 +54,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Mon Jul 23 2012 Jan Kaluza <jkaluza at redhat.com> - 0.8-9
++* Mon Jul 23 2012 Jan Kaluza <jkaluza at redhat.com> - 0.8-10
 +- Use proper httpd-2.4 patch
 +
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Apr 10 2012  - Jakub Hrozek <jhrozek at redhat.com> 0.8-8
  - Fix compilation with httpd-2.4 (Jan Kaluza <jkaluza at redhat.com>)
  - Provide backwards-compatible _httpd_apxs macro