From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 19 Apr 2017 11:43:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/stable/3.0'
X-Git-Tag: reindent-master-before~217
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9134c9e9586fce4dcc18b33668c50c2e200d9ef3;p=matthieu%2Ffrr.git

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

9134c9e9586fce4dcc18b33668c50c2e200d9ef3