]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0778b99 2f075ff)
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 patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge
Stefan's tree of IPFire 2.x.