From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 24 Apr 2012 21:37:01 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.3.8~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3589546af4baa4d349409a318f8c9658dd11b3cc;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

3589546af4baa4d349409a318f8c9658dd11b3cc