git.ipfire.org Git - ipfire-2.x.git/commit

]> git.ipfire.org Git - ipfire-2.x.git/commit

projects / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 41410d1 6b86307)

author	Michael Tremer <michael.tremer@ipfire.org>
	Fri, 22 Jan 2016 00:54:14 +0000 (00:54 +0000)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Fri, 22 Jan 2016 00:54:14 +0000 (00:54 +0000)
commit	8a1a3bf3934c8a92c605135ee13db466ea3dcbf4
tree	1de250dacc1861e03c548c3fa603cd46aed686bb	tree \| snapshot
parent	41410d197b3dbf75dfd05376ed623857adac8977	commit \| diff
parent	6b86307cac1ed49a3d88836fc5fa90eef98a33ca	commit \| diff

Merge remote-tracking branch 'ms/iptables-conntrack' into next

13 files changed:

config/rootfiles/common/stage2	diff1 \|	diff2 \|	blob \| history
doc/language_issues.es	diff1 \|	diff2 \|	blob \| history
doc/language_issues.fr	diff1 \|	diff2 \|	blob \| history
doc/language_issues.it	diff1 \|	diff2 \|	blob \| history
doc/language_issues.nl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.pl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.ru	diff1 \|	diff2 \|	blob \| history
doc/language_issues.tr	diff1 \|	diff2 \|	blob \| history
doc/language_missings	diff1 \|	diff2 \|	blob \| history
langs/de/cgi-bin/de.pl	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	diff1 \|	diff2 \|	blob \| history
lfs/configroot	diff1 \|	diff2 \|	blob \| history
src/initscripts/init.d/firewall	diff1 \|	diff2 \|	blob \| history

IPFire 2.x development tree