]> 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: 60bce6b ca4259a)
Merge remote-tracking branch 'amarx/BUG10620' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 11:03:22 +0000 (13:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 26 Sep 2014 11:03:22 +0000 (13:03 +0200)
1  2 
config/firewall/rules.pl patch | diff1 | diff2 | blob | history

diff --cc config/firewall/rules.pl
Simple merge
Peter's tree of IPFire 2.x