]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 26 Jun 2013 15:02:13 +0000 (17:02 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 26 Jun 2013 15:02:13 +0000 (17:02 +0200)
1  2 
pdns/Makefile.am

Simple merge