From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 25 Apr 2017 14:42:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/3.0'
X-Git-Tag: reindent-master-before~215
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1876a731a43cf929d32ac6247ba92a5439a7d299;p=matthieu%2Ffrr.git

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

1876a731a43cf929d32ac6247ba92a5439a7d299