Merge pull request #305 from opensourcerouting/build-doc-updates

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 30 Mar 2017 19:23:15 +0000 (14:23 -0500)

committer GitHub <noreply@github.com>

Thu, 30 Mar 2017 19:23:15 +0000 (14:23 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 30 Mar 2017 19:23:15 +0000 (14:23 -0500)
committer GitHub <noreply@github.com>
Thu, 30 Mar 2017 19:23:15 +0000 (14:23 -0500)
diff --cc doc/Building_FRR_on_OpenBSD6.md
Simple merge
diff --cc doc/Building_FRR_on_Ubuntu1204.md
Simple merge
diff --cc doc/Building_FRR_on_Ubuntu1604.md
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 30 Mar 2017 19:23:15 +0000 (14:23 -0500)
committer	GitHub <noreply@github.com>
	Thu, 30 Mar 2017 19:23:15 +0000 (14:23 -0500)
		1	2
doc/Building_FRR_on_OpenBSD6.md	patch \|	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1204.md	patch \|	diff1 \|	diff2 \|	blob \| history
doc/Building_FRR_on_Ubuntu1604.md	patch \|	diff1 \|	diff2 \|	blob \| history