From: Paul Jakma Date: Sun, 8 Jan 2012 14:47:06 +0000 (+0000) Subject: Marker merge for 'RE-0.99.17.6' X-Git-Tag: frr-2.0-rc1~1918 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=dc00d2bb56aa6a84dd2328133f69db3c3e6d9dc7;p=mirror%2Ffrr.git Marker merge for 'RE-0.99.17.6' This marker merge (i.e. an 'ours' strategy merge) is a placeholder to show that all commits in Quagga-RE stable, to its release RE-0.99.17.6 tag, have been reviewed and merged into 'master'. --- dc00d2bb56aa6a84dd2328133f69db3c3e6d9dc7