From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 17 Apr 2017 23:12:44 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/3.0'
X-Git-Tag: reindent-master-before~221
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0f5ec54a693d7309c7095da45575068a8add84fe;p=matthieu%2Ffrr.git

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

0f5ec54a693d7309c7095da45575068a8add84fe