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

[Charles R. Anderson]

commit a43135ae33d93400e351189471a1466837b6e6fe
Merge: ada9baa d752fd9
Author: Charles R. Anderson <cra at wpi.edu>
Date:   Fri May 24 07:57:23 2013 -0400

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

 fping.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc fping.spec
index f988456,f6d19ff..3af284e
--- a/fping.spec
+++ b/fping.spec
@@@ -48,9 -48,9 +48,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man8/*
  
  %changelog
- * Mon Sep 24 2012 Charles R. Anderson <cra at wpi.edu> - 3.5-1
++* Fri May 24 2013 Charles R. Anderson <cra at wpi.edu> - 3.5-1
 +- update to 3.5 (rhbz#925355, rhbz#966000)
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Mon Sep 24 2012 Charles R. Anderson <cra at wpi.edu> - 3.4-1
  - update to 3.4 which fixes rhbz#854572 by restoring previous behavior:
    * Revert "Output statistics to stdout instead of stderr", because it breaks