From: David Lamparter Date: Thu, 8 Dec 2016 14:04:16 +0000 (+0100) Subject: Merge branch 'fixes/chris-for-stable-2.0' into stable/2.0 X-Git-Tag: frr-2.0-rc1~23 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=25801920d2bdd955ec1c64cb04751890e576ee91;p=matthieu%2Ffrr.git Merge branch 'fixes/chris-for-stable-2.0' into stable/2.0 Signed-off-by: David Lamparter --- 25801920d2bdd955ec1c64cb04751890e576ee91