From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 18 May 2014 12:53:54 +0000 (+0200)
Subject: Merge commit 'origin/master' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e508d166a9d76a67d1cfbd5040b45c368508bc78;p=thirdparty%2Fbird.git

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

e508d166a9d76a67d1cfbd5040b45c368508bc78