]> 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: 12b901f 11ab2c7)
Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 31 Oct 2013 14:35:34 +0000 (15:35 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 31 Oct 2013 14:35:34 +0000 (15:35 +0100)
1  2 
html/cgi-bin/firewall.cgi patch | diff1 | diff2 | blob | history

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