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

[Paul Wouters]

commit 4d49e5880fe5e1820b5f5b9fc9efbc9301a5fe94
Merge: f33192b 744e050
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Aug 24 11:31:56 2012 -0400

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

 validns.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc validns.spec
index 894210b,335d6af..5b3bd0c
--- a/validns.spec
+++ b/validns.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: DNS and DNSSEC zone file validator
  Name: validns
  Version: 0.5
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: BSD
  Url:  http://www.validns.net/
  Source: http://www.validns.net/download/%{name}-%{version}.tar.gz
@@@ -37,10 -35,9 +37,13 @@@ rm -rf %{buildroot
  %{_mandir}/man1/validns.1.gz
  
  %changelog
- * Fri Aug 24 2012 Paul Wouters <pwouters at redhat.com> - 0.5-2
++* Fri Aug 24 2012 Paul Wouters <pwouters at redhat.com> - 0.5-3
 +- Patch for handling NSEC/NSEC3 camelcasing
 +- Support TLSA records
 +
+ * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Thu Jun 07 2012 Paul Wouters <pwouters at redhat.com> - 0.5-1
  - Updated to 0.5 which supports Parallelize signature verification
  - Install man page