]> git.ipfire.org Git - thirdparty/lldpd.git/commitdiff
Merge branch 'feature/1/cli'
authorVincent Bernat <bernat@luffy.cx>
Sat, 5 Jan 2013 16:00:05 +0000 (17:00 +0100)
committerVincent Bernat <bernat@luffy.cx>
Sat, 5 Jan 2013 16:00:05 +0000 (17:00 +0100)

Trivial merge