Merge remote-tracking branch 'amarx/firewall' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Aug 2013 09:33:20 +0000 (11:33 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Aug 2013 09:33:20 +0000 (11:33 +0200)
commit2ac39db92e9b6117d64940f8b0572a24afa07b33
tree6058a5fc406674e8a90b9da79b0277916665e945
parent30156b054ef332d8b1ece6fc5d9e0cdbc947ca14
parenteb95ce89a8effefa0c6aa27bf6f048926d21fed0
Merge remote-tracking branch 'amarx/firewall' into fifteen
config/cfgroot/header.pl
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_issues.tr
doc/language_missings
html/cgi-bin/ovpnmain.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl