]> 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: 2795e57 c6048d2)
Merge branch 'iptables-upnpfw' into core67-merge
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:57:39 +0000 (13:57 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:57:39 +0000 (13:57 +0100)
1  2 
src/initscripts/init.d/firewall patch | diff1 | diff2 | blob | history

diff --cc src/initscripts/init.d/firewall
Simple merge
Peter's tree of IPFire 2.x