From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sun, 14 Mar 2010 23:39:45 +0000 (+0100)
Subject: Merge commit 'origin/master' into new
X-Git-Tag: v1.2.2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e3bfd9006ba3033a814a392f9bf4bbca060c8a9;p=thirdparty%2Fbird.git

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

4e3bfd9006ba3033a814a392f9bf4bbca060c8a9