Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Oct 2015 12:50:07 +0000 (13:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Oct 2015 12:50:31 +0000 (13:50 +0100)
commit364452506fcc7170c000d2ac7fe7ae67351a6241
treeecfa9ca25f7ebc434f91c96cc25598cfa9c6ac3c
parent4e8949e8177a13dde72946ea9d02d0c12badafe0
parent5fd7e84c499320c9ba1d81c78a706cd42b5bfc2c
Merge remote-tracking branch 'ms/dhcp-rfc2136-broken-down' into next
14 files changed:
doc/language_issues.de
doc/language_issues.en
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.it
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
html/cgi-bin/dhcp.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
src/initscripts/init.d/dnsmasq