From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 31 Jan 2017 12:50:05 +0000 (+0100)
Subject: Merge branch 'frr/pull/137'
X-Git-Tag: frr-3.0-branchpoint~61
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3300077c9be66b95021707c2a0e517f8fd6058a2;p=matthieu%2Ffrr.git

Merge branch 'frr/pull/137'

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

3300077c9be66b95021707c2a0e517f8fd6058a2