From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Oct 2012 12:51:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'kbarthel/dhcp_dns'
X-Git-Tag: 006~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376f3d986e853f891a55c0eadd7332c0f8eff9f4;p=network.git

Merge remote-tracking branch 'kbarthel/dhcp_dns'
---

376f3d986e853f891a55c0eadd7332c0f8eff9f4