Merge remote-tracking branch 'ummeegge/openvpn' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 May 2014 16:47:11 +0000 (18:47 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 May 2014 16:47:11 +0000 (18:47 +0200)
commit661cd276b68c274ecfee7cdf3bd6c7204dc56572
tree48f6625ce5c24753cb4b69783dde5722025c4824
parentb2e75449a98f19e47b8aaf7623a6299749b21de6
parent49abe7afb1868315b96643afe08c12fa1b339e3a
Merge remote-tracking branch 'ummeegge/openvpn' into next

Conflicts:
html/cgi-bin/ovpnmain.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
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