]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commit
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)
commitf0728c790ffce0acc5373bc340596a5e9974c8c1
tree59f615b6267420dd25fc5a8eba523cb7589e2043
parentdccbf1bf4e38401bc8be2d74c9bbc41e4f55e3ad
parentcea4fc3aaf3fb9b776a2209ccdaff6452e099f8e
Merge remote-tracking branch 'origin/master' into next

Conflicts:
config/cfgroot/general-functions.pl
src/initscripts/init.d/firewall