From: Renato Westphal <renato@openbsd.org>
Date: Thu, 6 Sep 2018 15:33:26 +0000 (-0300)
Subject: Merge pull request #2974 from donaldsharp/v4_and_v6
X-Git-Tag: frr-7.1-dev~393
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f9ecc65d03852bbb0be5872d4e5c7aac40aa85ea;p=mirror%2Ffrr.git

Merge pull request #2974 from donaldsharp/v4_and_v6

V4 and v6
---

f9ecc65d03852bbb0be5872d4e5c7aac40aa85ea