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)
commit2a6e9ae967cd13e136cb563622236c979ba788c6
treeb3bd04f8944b3f7a63c5311af2208e965d519ed5
parente9a056234592750a42ff82c12e858069b32ab82e
parentdaf400fa4d61a02eb17e24d29be01d2bbaa35f31
Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl