Merge pull request #850 from nitsakh/feat-809

author Zachary Yedidia <zyedidia@gmail.com>

Wed, 4 Oct 2017 03:49:57 +0000 (23:49 -0400)

committer GitHub <noreply@github.com>

Wed, 4 Oct 2017 03:49:57 +0000 (23:49 -0400)
author Zachary Yedidia <zyedidia@gmail.com>
Wed, 4 Oct 2017 03:49:57 +0000 (23:49 -0400)
committer GitHub <noreply@github.com>
Wed, 4 Oct 2017 03:49:57 +0000 (23:49 -0400)
diff --cc cmd/micro/actions.go
Simple merge
diff --cc cmd/micro/bindings.go
Simple merge
author	Zachary Yedidia <zyedidia@gmail.com>
	Wed, 4 Oct 2017 03:49:57 +0000 (23:49 -0400)
committer	GitHub <noreply@github.com>
	Wed, 4 Oct 2017 03:49:57 +0000 (23:49 -0400)
		1	2
cmd/micro/actions.go	patch \|	diff1 \|	diff2 \|	blob \| history
cmd/micro/bindings.go	patch \|	diff1 \|	diff2 \|	blob \| history