]> 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: 578f23c d4ee6f0)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 12 Apr 2015 21:23:40 +0000 (23:23 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 12 Apr 2015 21:23:40 +0000 (23:23 +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