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

[Fabian Affolter]

commit 421c1ff0d3986f6323bc8b88e7d36d0e4972268c
Merge: 16c390f 2e2bbcb
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Thu Jun 27 21:22:42 2013 +0200

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

 dhcping.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc dhcping.spec
index 2f06a08,eb94164..9c4d3e4
--- a/dhcping.spec
+++ b/dhcping.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           dhcping
  Version:        1.2
--Release:        9%{?dist}
++Release:        10%{?dist}
  Summary:        DHCP daemon ping program
  
  Group:          Applications/Internet
@@@ -30,9 -29,9 +30,12 @@@ make install DESTDIR=%{buildroot} INSTA
  %{_bindir}/%{name}
  
  %changelog
- * Wed Jun 26 2013 Fabian Affolter <mail at fabian-affolter.ch>- 1.2-9
++* Wed Jun 26 2013 Fabian Affolter <mail at fabian-affolter.ch>- 1.2-10
 +- Patch added for ARM 64
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Sat Sep 29 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.2-8
  - Clean-up