From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 10 May 2017 00:39:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/3.0'
X-Git-Tag: reindent-master-before~186
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a1b4f854b0162077b12d8dc7ad4b9e85ba7f458c;p=matthieu%2Ffrr.git

Merge remote-tracking branch 'origin/stable/3.0'
---

a1b4f854b0162077b12d8dc7ad4b9e85ba7f458c