From: David Lamparter <equinox@diac24.net>
Date: Mon, 16 Apr 2012 14:46:13 +0000 (+0200)
Subject: bgpd: merge osr/quagga-osr-patches (BZ#700)
X-Git-Tag: frr-2.0-rc1~1862
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6e493a44836d3b034ed3421e866878de3fbfcc5b;p=matthieu%2Ffrr.git

bgpd: merge osr/quagga-osr-patches (BZ#700)

this merges a bgp capability negotiation fix where bgpd would fail if no
multiprotocol capability was present, but other capabilities were.
---

6e493a44836d3b034ed3421e866878de3fbfcc5b