]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge remote-tracking branch 'mfischer/dnsmasq' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Jun 2015 11:12:33 +0000 (13:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Jun 2015 11:12:33 +0000 (13:12 +0200)
commitdff6612b02b564c0b0b202bbe33955d1cac7927c
treebfb1f1c05f44ab485c21cfd77da13246f158e8cb
parent697b4f04bf8a007b289e424cf88bfbba7a2df71a
parent508288ab6b369451614dada8837d7883e8bec2c6
Merge remote-tracking branch 'mfischer/dnsmasq' into next

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Conflicts:
lfs/dnsmasq
src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch