From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Apr 2015 10:54:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into core89
X-Git-Tag: v2.17-core89~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9a927998d9832e4060737b31f0d95f5223ccb9a;p=ipfire-2.x.git

Merge remote-tracking branch 'origin/master' into core89

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

b9a927998d9832e4060737b31f0d95f5223ccb9a