Merge remote-tracking branch 'ms/experimental-vlan-hotplugging' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:33:49 +0000 (14:33 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:33:49 +0000 (14:33 +0100)

Trivial merge