]> git.proxmox.com Git - mirror_frr.git/commitdiff
projects / mirror_frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f31d692 708a758)
Marker merge for 'RE-0.99.17.6'
authorPaul Jakma <paul@quagga.net>
Sun, 8 Jan 2012 14:47:06 +0000 (14:47 +0000)
committerPaul Jakma <paul@quagga.net>
Sun, 8 Jan 2012 14:47:27 +0000 (14:47 +0000)
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'.


Trivial merge
FRRouting mirror