]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c400bc2 3db5848)
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
Peter's tree of IPFire 2.x