From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Tue, 24 Nov 2015 14:21:11 +0000 (+0100)
Subject: Merge branch 'master' into rip-new
X-Git-Tag: v1.6.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90f78507f4a13673ccf0ba7c786b43d9e882fca7;p=thirdparty%2Fbird.git

Merge branch 'master' into rip-new
---

90f78507f4a13673ccf0ba7c786b43d9e882fca7