git.proxmox.com Git - mirror_frr.git/commit

author	David Lamparter <equinox@opensourcerouting.org>
	Tue, 23 Oct 2018 10:42:42 +0000 (12:42 +0200)
committer	David Lamparter <equinox@opensourcerouting.org>
	Tue, 23 Oct 2018 10:42:42 +0000 (12:42 +0200)
commit	cd5f56bb4e653dae0219121fec5ea922d871355b
tree	672545af896a6043bd36c44c31d3ef03c3bea3c7	tree
parent	064518517c57024e65e177ee79c0a98f9f28ef6e	commit \| diff
parent	ef57f35f419f1ec6ec0dc90b07c9f1117aafa93a	commit \| diff

Merge branch 'pull/3165'

...with an additional comment.

Signed-off-by: David Lamparter <equinox@diac24.net>