Merge pull request #2005 from qlyoung/remove-masc-node

author Rafael Zalamena <rzalamena@users.noreply.github.com>

Mon, 2 Apr 2018 20:55:44 +0000 (17:55 -0300)

committer GitHub <noreply@github.com>

Mon, 2 Apr 2018 20:55:44 +0000 (17:55 -0300)
author Rafael Zalamena <rzalamena@users.noreply.github.com>
Mon, 2 Apr 2018 20:55:44 +0000 (17:55 -0300)
committer GitHub <noreply@github.com>
Mon, 2 Apr 2018 20:55:44 +0000 (17:55 -0300)
diff --cc lib/command.c
Simple merge
diff --cc lib/command.h
Simple merge
author	Rafael Zalamena <rzalamena@users.noreply.github.com>
	Mon, 2 Apr 2018 20:55:44 +0000 (17:55 -0300)
committer	GitHub <noreply@github.com>
	Mon, 2 Apr 2018 20:55:44 +0000 (17:55 -0300)
		1	2
lib/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/command.h	patch \|	diff1 \|	diff2 \|	blob \| history