Merge remote-tracking branch 'amarx/10538' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:42:32 +0000 (22:42 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:42:32 +0000 (22:42 +0200)
commitd6c50a8591b20d21ef7ab15fa25926958bf9a9d3
tree0d2bc3bb0e095bb578796888393f70b07d4d8abc
parent8bc689164ed8e1f2cab5e9690f78f0c744a7a5e2
parentceb78c46f3795e699af21fdd84289e78d7dda9a1
Merge remote-tracking branch 'amarx/10538' into next
config/cfgroot/general-functions.pl
html/cgi-bin/ovpnmain.cgi