Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Apr 2015 15:59:21 +0000 (17:59 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Apr 2015 15:59:21 +0000 (17:59 +0200)
1  2 
html/cgi-bin/ovpnmain.cgi

Simple merge