vlan: merge branch 'jk/vlan-assume-and-fixes'
authorThomas Haller <thaller@redhat.com>
Tue, 27 Oct 2015 16:26:38 +0000 (17:26 +0100)
committerThomas Haller <thaller@redhat.com>
Tue, 27 Oct 2015 16:26:38 +0000 (17:26 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=754433


Trivial merge