]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge branch 'use-polarssl-md5' of github.com:cmouse/pdns into cmouse-use-polarssl-md5
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 27 May 2013 11:48:57 +0000 (13:48 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Mon, 27 May 2013 11:48:57 +0000 (13:48 +0200)
commitc8b24bb35f13f929de5b3cbee820b6b395992737
tree067003019681cee676c7e782bc1046ce53c78622
parent0d5e9d2f5793592da581d11e247b58d159385685
parent2e28d1f0dcb50a79d0ca60ae9696c5bea71943d9
Merge branch 'use-polarssl-md5' of github.com:cmouse/pdns into cmouse-use-polarssl-md5

Conflicts:
pdns/Makefile.am
pdns/Makefile.am