From: Pavel Tvrdík <pawel.tvrdik@gmail.com>
Date: Thu, 17 Dec 2015 15:58:45 +0000 (+0100)
Subject: Merge branch 'master' into HEAD
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frpki;p=thirdparty%2Fbird.git

Merge branch 'master' into HEAD
---

96871cd77a1dc551e2d5b7274ce4242f8062fa6a