From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Thu, 6 Feb 2014 15:47:43 +0000 (+0100)
Subject: Merge commit 'origin/master' into socket
X-Git-Tag: v1.4.1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f48fa14214301382b2e6b134788a7506b61b664f;p=thirdparty%2Fbird.git

Merge commit 'origin/master' into socket
---

f48fa14214301382b2e6b134788a7506b61b664f