From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Dec 2014 22:51:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/wget' into next
X-Git-Tag: v2.17-core89~83^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a3d6f5ad10c81768337f3a8c11dd0c128f908fd;p=people%2Fstevee%2Fipfire-2.x.git

Merge remote-tracking branch 'mfischer/wget' into next

Conflicts:
	make.sh
---

9a3d6f5ad10c81768337f3a8c11dd0c128f908fd