From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 26 Jan 2017 02:15:33 +0000 (+0100)
Subject: Merge branch 'frr/pull/118'
X-Git-Tag: frr-3.0-branchpoint~64^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1e78204400361625235b3e7ea5d2c570b16d7c55;p=matthieu%2Ffrr.git

Merge branch 'frr/pull/118'

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

1e78204400361625235b3e7ea5d2c570b16d7c55