From: David Lamparter Date: Wed, 9 Aug 2017 11:13:01 +0000 (+0200) Subject: Merge branch 'stable/3.0' into tmp-3.0-master-merge X-Git-Tag: frr-4.0-dev~439^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0e236c6cd7bef12a2a375153a0e2d81a961562a2;p=matthieu%2Ffrr.git Merge branch 'stable/3.0' into tmp-3.0-master-merge Marker (--strategy=ours) merge to record which point in history master is in sync with related to stable/3.0. Signed-off-by: David Lamparter --- 0e236c6cd7bef12a2a375153a0e2d81a961562a2