]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'frr/pull/118'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 26 Jan 2017 02:15:33 +0000 (03:15 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 26 Jan 2017 02:15:33 +0000 (03:15 +0100)
commit1e78204400361625235b3e7ea5d2c570b16d7c55
tree4c95be2dd0fdb4ed7096d7d00036276435e22466
parent6dfe1c38d7d4d60c3ddae3134af6877fd2047d82
parenta957a05bb47a8bf444ce0aee1b81d786cac9e3a9
Merge branch 'frr/pull/118'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>