From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 29 Apr 2011 17:03:19 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: v1.3.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5964569c23829ec93fcf671a2582be01c8aebecf;p=thirdparty%2Fbird.git

Merge commit 'origin/master'
---

5964569c23829ec93fcf671a2582be01c8aebecf