From: Pieter Lexis Date: Thu, 2 Apr 2015 10:29:36 +0000 (+0200) Subject: Merge branch 'fix-debian-scripts' of https://github.com/tuxis-ie/pdns into tuxis... X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~98^2~23^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fc5f643461a145fe28d612cc4f1350762a5d5d1;p=thirdparty%2Fpdns.git Merge branch 'fix-debian-scripts' of https://github.com/tuxis-ie/pdns into tuxis-ie-fix-debian-scripts Conflicts: debian-pdns/pdns-doc.postinst debian-pdns/pdns-doc.prerm --- 9fc5f643461a145fe28d612cc4f1350762a5d5d1