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)

Trivial merge