From: David Lamparter Date: Wed, 9 Aug 2017 10:09:04 +0000 (+0200) Subject: Merge commit '78986c0' into tmp-3.0-master-merge X-Git-Tag: frr-4.0-dev~439^2~10 X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=211ee93ffb02c5b404a7206e4f46bd23d02d2d26 Merge commit '78986c0' 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 --- 211ee93ffb02c5b404a7206e4f46bd23d02d2d26