From: Michael Tremer Date: Wed, 8 Jan 2014 14:01:10 +0000 (+0100) Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=efca40b5cc923da6fc169d3bb2eaa2f39708330b;hp=31d488a4f688903fd27269a18bdb84d53e9ef6d6 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen --- diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 52dc6e464..c620ab09d 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4748,8 +4748,8 @@ END
- - + +
  END diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index af68d50a2..0f60820ed 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2870,8 +2870,8 @@ END
- - + +