[perl-Net-DNS-SEC/f19: 3/3] Merge branch 'master' into f19

[Paul Wouters]

commit 7d7f43648e7ea34e98485b1b51570e6714ca00ed
Merge: 9f72dc0 2e65d64
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue May 27 17:58:52 2014 -0400

    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore            |    1 +
 perl-Net-DNS-SEC.spec |    5 ++++-
 sources               |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---