From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 4 May 2014 09:59:50 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.4.4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a3905fe905ab1cc1a58fe9e6a4284f7d5057d13;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

5a3905fe905ab1cc1a58fe9e6a4284f7d5057d13