Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

author Vipin Kumar <vipin@cumulusnetworks.com>

Wed, 4 Nov 2015 06:05:02 +0000 (22:05 -0800)

committer Vipin Kumar <vipin@cumulusnetworks.com>

Wed, 4 Nov 2015 06:05:02 +0000 (22:05 -0800)
author Vipin Kumar <vipin@cumulusnetworks.com>
Wed, 4 Nov 2015 06:05:02 +0000 (22:05 -0800)
committer Vipin Kumar <vipin@cumulusnetworks.com>
Wed, 4 Nov 2015 06:05:02 +0000 (22:05 -0800)
diff --cc lib/memtypes.c
Simple merge
diff --cc ospfd/ospf_zebra.c
Simple merge
author	Vipin Kumar <vipin@cumulusnetworks.com>
	Wed, 4 Nov 2015 06:05:02 +0000 (22:05 -0800)
committer	Vipin Kumar <vipin@cumulusnetworks.com>
	Wed, 4 Nov 2015 06:05:02 +0000 (22:05 -0800)
		1	2
lib/memtypes.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history