Merge branch 'next'

author Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Sat, 2 Sep 2017 13:10:48 +0000 (15:10 +0200)

committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Sat, 2 Sep 2017 13:10:48 +0000 (15:10 +0200)
author Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 2 Sep 2017 13:10:48 +0000 (15:10 +0200)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 2 Sep 2017 13:10:48 +0000 (15:10 +0200)
diff --cc .gitlab-ci.yml
Simple merge
diff --cc DEVELOPERS
Simple merge
diff --cc package/Config.in
Simple merge
diff --cc package/minidlna/minidlna.mk
Simple merge
author	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
	Sat, 2 Sep 2017 13:10:48 +0000 (15:10 +0200)
committer	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
	Sat, 2 Sep 2017 13:10:48 +0000 (15:10 +0200)
		1	2
.gitlab-ci.yml	patch \|	diff1 \|	diff2 \|	blob \| history
DEVELOPERS	patch \|	diff1 \|	diff2 \|	blob \| history
package/Config.in	patch \|	diff1 \|	diff2 \|	blob \| history
package/minidlna/minidlna.mk	patch \|	diff1 \|	diff2 \|	blob \| history