]> 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: a610e13 c50ba48)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Jul 2013 20:05:12 +0000 (22:05 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Jul 2013 20:05:12 +0000 (22:05 +0200)
1  2 
html/cgi-bin/proxy.cgi patch | diff1 | diff2 | blob | history

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