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

[Charles R. Anderson]

commit 8520c1483554fbea16233a6311060ee8aaee9b02
Merge: 4eb53da ce4637e
Author: Charles R. Anderson <cra at wpi.edu>
Date:   Tue Aug 13 22:51:14 2013 -0400

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

 fping.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc fping.spec
index 9ea0e86,8d1d64a..4afcc14
--- a/fping.spec
+++ b/fping.spec
@@@ -9,7 -7,7 +9,7 @@@
  
  Name: fping
  Version: 3.5
--Release: 2%{?dist}
++Release: 3%{?dist}
  Summary: Scriptable, parallelized ping-like utility
  Group: Applications/Internet
  License: BSD with advertising
@@@ -50,9 -48,9 +50,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man8/*
  
  %changelog
- * Tue Aug 13 2013 Charles R. Anderson <cra at wpi.edu> - 3.5-2
++* Tue Aug 13 2013 Charles R. Anderson <cra at wpi.edu> - 3.5-3
 +- enable _hardened_build for -fPIE (rhbz#983602)
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Fri May 24 2013 Charles R. Anderson <cra at wpi.edu> - 3.5-1
  - update to 3.5 (rhbz#925355, rhbz#966000)