]> git.ipfire.org Git - ipfire-2.x.git/commit
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)
commitb9a927998d9832e4060737b31f0d95f5223ccb9a
tree346e7f201b2fdfe1313a03b66f175c1cde0976ca
parent7f024f5e46e24d67a3b64dc12d8110b5b3d0ce8c
parentc63e97bbaf668813ed221d4bcad9019429705a31
Merge remote-tracking branch 'origin/master' into core89

Conflicts:
config/rootfiles/core/89/update.sh
src/initscripts/init.d/dnsmasq
config/rootfiles/core/89/update.sh