[validns/f18: 8/8] Merge branch 'master' into f18

[Paul Wouters]

commit 24b7d6e575b88174fffbacc84ad65181548a9b51
Merge: d288e81 e17b511
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 16 14:51:26 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	sources
    	validns.spec

 .gitignore               |    1 +
 sources                  |    1 +
 validns-0.7-timing.patch |   81 ++++++++++++++++++++++++++++++++++++++++++++++
 validns.spec             |   15 ++++----
 4 files changed, 90 insertions(+), 8 deletions(-)
---
diff --cc sources
index 7d4f199,0c87f8f..fe0ccb5
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,3 @@@
 +de8ad86d7a87dc20ef800c9286090985  validns-0.5.tar.gz
 +c1f43e1fdc26e1f5a94497451325ad49  validns-0.6.tar.gz
+ 40b0641ca9dad5669cb0bf0473611d2d  validns-0.7.tar.gz
diff --cc validns.spec
index 1601f31,62c1350..8a6add2
--- a/validns.spec
+++ b/validns.spec
@@@ -37,6 -32,13 +32,10 @@@ cp -a validns.1.gz %{buildroot}/%{_mand
  %{_mandir}/man1/validns.1.gz
  
  %changelog
+ * Tue Apr 16 2013 Paul Wouters <pwouters at redhat.com> - 0.7-1
+ - Updated to 0.7.
+ - Removed some el-5 only spec attributes
+ 
 -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Fri Oct 12 2012 Paul Wouters <pwouters at redhat.com> - 0.6-2
  - Added -x option to skip timing info in statistics