From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 22 May 2013 13:56:00 +0000 (+0200)
Subject: Merge commit 'a9fc659b840e13323aa43e92eb8f39ceb19b5ed6' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92fd1fc02f7e4943e5f98d823d34cea7742d7bc4;p=thirdparty%2Fbird.git

Merge commit 'a9fc659b840e13323aa43e92eb8f39ceb19b5ed6' into integrated

Conflicts:

	proto/rip/rip.c
---

92fd1fc02f7e4943e5f98d823d34cea7742d7bc4