Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:14:13 +0000 (23:14 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:14:13 +0000 (23:14 +0100)
commitdd29d563a603b0bc182af23efd5160caf75657c4
tree761204ebb532b8afff6c1354ef3509380e84532c
parent2d6ac13175c0ffa0a5940d812fb45e91f5585264
parent0d0df35ca260e5934f66ac79247dd9682f20795f
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next

Conflicts:
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
12 files changed:
doc/language_issues.de
doc/language_issues.en
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