Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
1  2 
html/cgi-bin/ovpnmain.cgi
make.sh

Simple merge
diff --cc make.sh
Simple merge