From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Mar 2015 16:53:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/dhcp' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e9fc7b868c52a6d2991d9878e1e96a7eb1eb4b4;p=people%2Fms%2Fipfire-2.x.git

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

6e9fc7b868c52a6d2991d9878e1e96a7eb1eb4b4