]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'babeld-merge' into master-copy
authorPaul Jakma <paul@quagga.net>
Sun, 25 Mar 2012 16:10:22 +0000 (17:10 +0100)
committerPaul Jakma <paul@quagga.net>
Sun, 25 Mar 2012 16:10:22 +0000 (17:10 +0100)

Trivial merge