From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Tue, 28 Jul 2015 03:31:35 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1292
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8a2951d36d17376cdf9af92ffd1aa208d8a91e97;p=matthieu%2Ffrr.git

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
---

8a2951d36d17376cdf9af92ffd1aa208d8a91e97