Merge branch 'feature/vlan-enabled-bridge'

diff --cc NEWS
index 2bef25c87250abeba076654cf5cd9fc196dc5174,9ce0b94c2b7de9001151f789036773575fbf5770..9cacee82d7c70782518a86fd81b4e07e1a73747b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,7 +1,12 @@@
  lldpd (1.0.5)
    * Changes:
      + Interface names are also matched for management addresses.
 +    + On Linux, only register protocol handler for LLDP when only LLDP
 +      is enabled.
 +    + Stricter on LLDP incoming frames validation.
+     + Add support for VLAN-aware bridges for Linux (no range support).
 +  * Fix:
 +    + Don't clear chassis TLV on shutdown LLDPDU.
  
  lldpd (1.0.4)
    * Changes:

diff --cc src/daemon/interfaces-linux.c
Simple merge

diff --cc src/daemon/lldpd.h
Simple merge