Merge remote-tracking branch 'ms/iptables-conntrack' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Jan 2016 00:54:14 +0000 (00:54 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Jan 2016 00:54:14 +0000 (00:54 +0000)
commit8a1a3bf3934c8a92c605135ee13db466ea3dcbf4
tree1de250dacc1861e03c548c3fa603cd46aed686bb
parent41410d197b3dbf75dfd05376ed623857adac8977
parent6b86307cac1ed49a3d88836fc5fa90eef98a33ca
Merge remote-tracking branch 'ms/iptables-conntrack' into next
13 files changed:
config/rootfiles/common/stage2
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
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/configroot
src/initscripts/init.d/firewall