From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Thu, 25 Feb 2016 17:25:53 +0000 (+0100)
Subject: Merge branch 'master' of gitlab.labs.nic.cz:labs/bird
X-Git-Tag: v1.6.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce95af7a5f5159033e569a7ccedce0e20bb5d913;p=thirdparty%2Fbird.git

Merge branch 'master' of gitlab.labs.nic.cz:labs/bird
---

ce95af7a5f5159033e569a7ccedce0e20bb5d913