systemd,lldp: merge branch 'th/systemd-lldp'
authorThomas Haller <thaller@redhat.com>
Mon, 29 Feb 2016 13:26:16 +0000 (14:26 +0100)
committerThomas Haller <thaller@redhat.com>
Mon, 29 Feb 2016 13:26:16 +0000 (14:26 +0100)

Trivial merge