Merge branch 'master' into staging

author Leo Famulari <leo@famulari.name>

Tue, 25 Apr 2017 18:27:03 +0000 (14:27 -0400)

committer Leo Famulari <leo@famulari.name>

Tue, 25 Apr 2017 18:27:03 +0000 (14:27 -0400)
author Leo Famulari <leo@famulari.name>
Tue, 25 Apr 2017 18:27:03 +0000 (14:27 -0400)
committer Leo Famulari <leo@famulari.name>
Tue, 25 Apr 2017 18:27:03 +0000 (14:27 -0400)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/base.scm
Simple merge
diff --cc gnu/packages/video.scm
Simple merge
author	Leo Famulari <leo@famulari.name>
	Tue, 25 Apr 2017 18:27:03 +0000 (14:27 -0400)
committer	Leo Famulari <leo@famulari.name>
	Tue, 25 Apr 2017 18:27:03 +0000 (14:27 -0400)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/base.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	patch \|	diff1 \|	diff2 \|	blob \| history