faf862 Merge branch 'master' of ssh://pkgs.fedoraproject.org/dnssec-trigger

Merged and Committed by Paul Wouters 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/dnssec-trigger
    
    Conflicts:
    	dnssec-triggerd.service
    
        
file modified
+5 -1