From: David Lamparter <equinox@opensourcerouting.org>
Date: Fri, 11 Jan 2013 20:46:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'savannah/sf/ospfd'
X-Git-Tag: frr-2.0-rc1~1724
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b2e5bdbe10c4145f508fcf1486ffe29d5ce516f7;p=mirror%2Ffrr.git

Merge remote-tracking branch 'savannah/sf/ospfd'

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

b2e5bdbe10c4145f508fcf1486ffe29d5ce516f7