[bandwidthd: 5/5] Merge branch 'master' of ssh://pkgs.fedoraproject.org/bandwidthd

[Ján ONDREJ]

commit 6f5ffbb6332e4fbc43644d9ec94dcee02407155a
Merge: 4dbe46d 9fc75cd
Author: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date:   Thu Nov 17 09:25:15 2011 +0100

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

 bandwidthd.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc bandwidthd.spec
index 382dca6,fd6c263..9c63e2a
--- a/bandwidthd.spec
+++ b/bandwidthd.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name:           bandwidthd
  Version:        2.0.1
--Release:        16%{?dist}
++Release:        17%{?dist}
  Summary:        Tracks network usage and builds html and graphs
  
  Group:          System Environment/Daemons
@@@ -115,9 -102,9 +115,12 @@@ f
  
  
  %changelog
- * Wed Nov 16 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-16
++* Wed Nov 16 2011 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-17
 +- added native systemd service (bz#754478)
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-16
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Wed Dec 09 2009 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 2.0.1-15
  - Applied patch from lkundrak to do not hang when no devices found. bz#537073