Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 29 Oct 2013 15:23:35 +0000 (16:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 29 Oct 2013 15:23:35 +0000 (16:23 +0100)
1  2 
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl

Simple merge
Simple merge