From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 10 Sep 2013 10:54:57 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.4.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d27e127aa996d500fed21be2bbbe888cafecb830;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

d27e127aa996d500fed21be2bbbe888cafecb830