]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge branch 'frr/pull/137'
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 31 Jan 2017 12:50:05 +0000 (13:50 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 31 Jan 2017 12:50:05 +0000 (13:50 +0100)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

Trivial merge