From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 15 May 2017 01:19:33 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/3.0'
X-Git-Tag: reindent-master-before~172
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=56afaa8bcbe59b62faff57546359df89c7b6fb4a;p=matthieu%2Ffrr.git

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

56afaa8bcbe59b62faff57546359df89c7b6fb4a