From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 23 Apr 2014 11:52:15 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.4.4~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6