]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dccbf1b cea4fc3)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@git.ipfire.org>
Tue, 29 Jul 2014 20:01:19 +0000 (22:01 +0200)
committerArne Fitzenreiter <arne_f@git.ipfire.org>
Tue, 29 Jul 2014 20:01:19 +0000 (22:01 +0200)
Conflicts:
config/cfgroot/general-functions.pl

1  2 
src/initscripts/init.d/firewall patch | diff1 | diff2 | blob | history

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