systemd: merge branch 'th/systemd-lldp-bgo763384' into master
authorThomas Haller <thaller@redhat.com>
Tue, 26 Jan 2016 16:22:54 +0000 (17:22 +0100)
committerThomas Haller <thaller@redhat.com>
Fri, 11 Mar 2016 08:37:04 +0000 (09:37 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=763384


Trivial merge