Merge pull request #4509 from opensourcerouting/spanish-intquisition

author Quentin Young <qlyoung@users.noreply.github.com>

Thu, 13 Jun 2019 18:00:50 +0000 (14:00 -0400)

committer GitHub <noreply@github.com>

Thu, 13 Jun 2019 18:00:50 +0000 (14:00 -0400)
author Quentin Young <qlyoung@users.noreply.github.com>
Thu, 13 Jun 2019 18:00:50 +0000 (14:00 -0400)
committer GitHub <noreply@github.com>
Thu, 13 Jun 2019 18:00:50 +0000 (14:00 -0400)
diff --cc lib/compiler.h
Simple merge
diff --cc lib/vty.c
Simple merge
author	Quentin Young <qlyoung@users.noreply.github.com>
	Thu, 13 Jun 2019 18:00:50 +0000 (14:00 -0400)
committer	GitHub <noreply@github.com>
	Thu, 13 Jun 2019 18:00:50 +0000 (14:00 -0400)
		1	2
lib/compiler.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/vty.c	patch \|	diff1 \|	diff2 \|	blob \| history