From: David Lamparter <equinox@opensourcerouting.org>
Date: Fri, 17 Feb 2017 17:06:54 +0000 (+0100)
Subject: Merge branch 'frr/pull/205' ("Pim stuff")
X-Git-Tag: frr-3.0-branchpoint~30
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9960254b7c3adacbcba47915ce5777466b2ee9aa;p=mirror%2Ffrr.git

Merge branch 'frr/pull/205' ("Pim stuff")

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

9960254b7c3adacbcba47915ce5777466b2ee9aa