Merge branch 'dnsmasq-dnssec' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Jul 2014 08:52:36 +0000 (10:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 8 Jul 2014 08:52:36 +0000 (10:52 +0200)
commit281f18fcb9b40834cf79671b3b489390a9826af1
tree2b19a9f58aff1a795b303c8f7356b314ed189bdf
parent9cf4a7f4188a5e68fc3daaf26661205ea3b69629
parentb66edc18d7954e235c08a0ea4bc82f0896f8cf59
Merge branch 'dnsmasq-dnssec' into next