]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'fix-debian-scripts' of https://github.com/tuxis-ie/pdns into tuxis...
authorPieter Lexis <pieter.lexis@powerdns.com>
Thu, 2 Apr 2015 10:29:36 +0000 (12:29 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Thu, 2 Apr 2015 10:29:36 +0000 (12:29 +0200)
Conflicts:
debian-pdns/pdns-doc.postinst
debian-pdns/pdns-doc.prerm

1  2 
debian/pdns.postinst
debian/pdns.postrm
debian/pdns.prerm

Simple merge
Simple merge
Simple merge