]> git.ipfire.org Git - people/ummeegge/ipfire-2.x.git/commitdiff
projects / people / ummeegge / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 290007b 1647059)
Merge remote-tracking branch 'stevee/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Nov 2012 11:58:40 +0000 (12:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 23 Nov 2012 11:58:40 +0000 (12:58 +0100)
1  2 
html/cgi-bin/ovpnmain.cgi patch | diff1 | diff2 | blob | history

diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge
IPFire 2.x development tree