]> 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: 9efba5f 9063a04)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout
authorAlexander Marx <amarx@ipfire.org>
Thu, 9 Jan 2014 15:23:39 +0000 (16:23 +0100)
committerAlexander Marx <amarx@ipfire.org>
Thu, 9 Jan 2014 15:23:39 +0000 (16:23 +0100)
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