From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 18 Jun 2015 11:12:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'mfischer/dnsmasq' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dff6612b02b564c0b0b202bbe33955d1cac7927c;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'mfischer/dnsmasq' into next

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Conflicts:
	lfs/dnsmasq
---

dff6612b02b564c0b0b202bbe33955d1cac7927c