From: David Lamparter <equinox@opensourcerouting.org>
Date: Tue, 19 Aug 2014 16:15:40 +0000 (+0200)
Subject: *: merge branch stable/0.99.23
X-Git-Tag: frr-2.0-rc1~1572
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1520e4748129c4eb97ac3090bcc97149a1900611;p=mirror%2Ffrr.git

*: merge branch stable/0.99.23

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

1520e4748129c4eb97ac3090bcc97149a1900611