From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 24 Aug 2015 17:50:43 +0000 (-0700)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1278
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c44e65bd3ffc2c342c96c7a12dd2fa4f5880a841;p=matthieu%2Ffrr.git

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

c44e65bd3ffc2c342c96c7a12dd2fa4f5880a841