]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge remote branch 'vincentbernat/feature/agentx'
authorDavid Lamparter <equinox@opensourcerouting.org>
Fri, 13 Jul 2012 12:05:36 +0000 (14:05 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Fri, 13 Jul 2012 12:05:40 +0000 (14:05 +0200)

Trivial merge