]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fed3de5 66298ef)
Merge branch 'cr_fix' of https://github.com/hadfl/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jul 2014 09:34:50 +0000 (11:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jul 2014 09:34:50 +0000 (11:34 +0200)
1  2 
html/cgi-bin/ovpnmain.cgi patch | diff1 | diff2 | blob | history

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