Auto merge of #1636 - daira:fix-licensing-and-remove-qt, r=str4d

author zkbot <[email protected]>

Fri, 10 Mar 2017 23:47:43 +0000 (23:47 +0000)

committer zkbot <[email protected]>

Fri, 10 Mar 2017 23:47:43 +0000 (23:47 +0000)
author zkbot <[email protected]>
Fri, 10 Mar 2017 23:47:43 +0000 (23:47 +0000)
committer zkbot <[email protected]>
Fri, 10 Mar 2017 23:47:43 +0000 (23:47 +0000)
diff --cc configure.ac
Simple merge
diff --cc contrib/gitian-descriptors/gitian-linux.yml
Simple merge
author	zkbot <[email protected]>
	Fri, 10 Mar 2017 23:47:43 +0000 (23:47 +0000)
committer	zkbot <[email protected]>
	Fri, 10 Mar 2017 23:47:43 +0000 (23:47 +0000)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/gitian-descriptors/gitian-linux.yml	patch \|	diff1 \|	diff2 \|	blob \| history