From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Sat, 17 Oct 2015 12:44:34 +0000 (+0200)
Subject: Merge branch 'master' into rip-new
X-Git-Tag: v1.6.0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eb8e546dc8cc647fcfa4a3a17dfa8ab36b00958;p=thirdparty%2Fbird.git

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

8eb8e546dc8cc647fcfa4a3a17dfa8ab36b00958