]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit - langs/ru/cgi-bin/ru.pl
Merge remote-tracking branch 'ms/firewall-no-nat' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 12:50:42 +0000 (14:50 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 7 Aug 2014 12:50:42 +0000 (14:50 +0200)
commit908555842cdeb364a5c28ecfc4d901432f6afd33
treeb6e693e4f8b5ff46fcc29ea818818c64ec05c65b
parentf808e5891c7ec7cedca1480f962ea3ff98fc4c38
parent983d471f93f7e71be27d94a416112e18842678e0
Merge remote-tracking branch 'ms/firewall-no-nat' into next

Conflicts:
doc/language_issues.nl
doc/language_issues.tr
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
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
src/initscripts/init.d/firewall