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)
1  2 
config/cfgroot/general-functions.pl
html/cgi-bin/ovpnmain.cgi

Simple merge
Simple merge