[dnsenum/epel7: 3/3] Merge branch 'master' into epel7

[Fabian Affolter]

commit 6abae3049f9804157fef6f8300e9310fb7a12849
Merge: b7f5b76 0357112
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Tue Mar 24 00:51:54 2015 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	dnsenum.spec
    	sources

 .gitignore   |  1 +
 dnsenum.spec | 10 ++++++++++
 sources      |  4 ++++
 3 files changed, 15 insertions(+)
---
diff --cc dnsenum.spec
index a350102,f8703cf..75a7f3b
--- a/dnsenum.spec
+++ b/dnsenum.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name:       dnsenum 
++<<<<<<< HEAD
 +Version:    1.2.4.1
++=======
+ Version:    1.2.4.2
++>>>>>>> master
  Release:    1%{?dist}
  Summary:    A tool to enumerate DNS info about domains 
  
@@@ -34,6 -34,9 +38,12 @@@ perform reverse lookups on netranges, w
  %{_bindir}/%{name}
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Mon Mar 23 2015 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.4.2-1
+ - Update to latest upstream release 1.2.4.2
+ 
++>>>>>>> master
  * Fri Sep 12 2014 Fabian Affolter <mail at fabian-affolter.ch> - 1.2.4.1-1
  - Update to latest upstream release 1.2.4.1
  
diff --cc sources
index 4654154,041fe74..b747f65
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +5ad1c03bd63813a01a6d205e1da7a01e  1.2.4.1.tar.gz
++=======
+ 03d5961337ef5f4a47aca6d35f345caa  1.2.4.2.tar.gz
++>>>>>>> master