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

Simple merge