From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 15 Apr 2012 13:15:05 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.3.8~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8b300164a975597f9b6caea0b205af2e4db30b;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

ae8b300164a975597f9b6caea0b205af2e4db30b