]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge branch 'dev/osr/vty_index'
authorDavid Lamparter <equinox@diac24.net>
Thu, 15 Dec 2016 20:34:53 +0000 (21:34 +0100)
committerGitHub <noreply@github.com>
Thu, 15 Dec 2016 20:34:53 +0000 (21:34 +0100)
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>

Trivial merge