From: David Lamparter <equinox@diac24.net>
Date: Thu, 18 May 2017 17:24:29 +0000 (+0200)
Subject: Merge pull request #571 from donaldsharp/nhrp
X-Git-Tag: reindent-master-before~138
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4d2d73c281b64d7e83a46f7e698a6e8b15f43615;p=matthieu%2Ffrr.git

Merge pull request #571 from donaldsharp/nhrp

Nhrp
---

4d2d73c281b64d7e83a46f7e698a6e8b15f43615