]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/master' into core89
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Apr 2015 10:54:14 +0000 (12:54 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 11 Apr 2015 10:54:14 +0000 (12:54 +0200)
Conflicts:
config/rootfiles/core/89/update.sh
src/initscripts/init.d/dnsmasq

1  2 
config/rootfiles/core/89/update.sh

Simple merge