]> git.puffer.fish Git - mirror/frr.git/commit
Merge branch 'fixes/chris-for-stable-2.0' into stable/2.0
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 8 Dec 2016 14:04:16 +0000 (15:04 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 8 Dec 2016 14:04:16 +0000 (15:04 +0100)
commit25801920d2bdd955ec1c64cb04751890e576ee91
tree185f70eaba0ff167c05a11d3efbca0c249073c83
parentd987f2339d25d32b654dabfe98a40677029575fe
parent7b6a4c46458b9e5699cdc1d51fa765a3929b1c0e
Merge branch 'fixes/chris-for-stable-2.0' into stable/2.0

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