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

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

dad9e527fcf33f169326054fb6924ff16af31669