Merge remote-tracking branch 'origin/next' into fifteen

author Arne Fitzenreiter <arne_f@ipfire.org>

Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge
diff --cc make.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Mon, 30 Dec 2013 12:45:10 +0000 (13:45 +0100)
		1	2
html/cgi-bin/ovpnmain.cgi	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history