Merge remote-tracking branch 'ms/firewall-new' into firewall

author Alexander Marx <amarx@ipfire.org>

Mon, 12 Aug 2013 11:30:45 +0000 (13:30 +0200)

committer Alexander Marx <amarx@ipfire.org>

Mon, 12 Aug 2013 11:30:45 +0000 (13:30 +0200)
author Alexander Marx <amarx@ipfire.org>
Mon, 12 Aug 2013 11:30:45 +0000 (13:30 +0200)
committer Alexander Marx <amarx@ipfire.org>
Mon, 12 Aug 2013 11:30:45 +0000 (13:30 +0200)
diff --cc doc/language_issues.es
Simple merge
diff --cc doc/language_issues.fr
Simple merge
diff --cc doc/language_issues.nl
Simple merge
diff --cc doc/language_issues.pl
Simple merge
diff --cc doc/language_issues.ru
Simple merge
diff --cc doc/language_issues.tr
Simple merge
diff --cc doc/language_missings
Simple merge
diff --cc langs/de/cgi-bin/de.pl
Simple merge
diff --cc langs/en/cgi-bin/en.pl
Simple merge
author	Alexander Marx <amarx@ipfire.org>
	Mon, 12 Aug 2013 11:30:45 +0000 (13:30 +0200)
committer	Alexander Marx <amarx@ipfire.org>
	Mon, 12 Aug 2013 11:30:45 +0000 (13:30 +0200)
		1	2
doc/language_issues.es	patch \|	diff1 \|	diff2 \|	blob \| history
doc/language_issues.fr	patch \|	diff1 \|	diff2 \|	blob \| history
doc/language_issues.nl	patch \|	diff1 \|	diff2 \|	blob \| history
doc/language_issues.pl	patch \|	diff1 \|	diff2 \|	blob \| history
doc/language_issues.ru	patch \|	diff1 \|	diff2 \|	blob \| history
doc/language_issues.tr	patch \|	diff1 \|	diff2 \|	blob \| history
doc/language_missings	patch \|	diff1 \|	diff2 \|	blob \| history
langs/de/cgi-bin/de.pl	patch \|	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	patch \|	diff1 \|	diff2 \|	blob \| history