Merge remote-tracking branch 'mfischer/wget' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:51:49 +0000 (23:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 22:51:49 +0000 (23:51 +0100)
commit9a3d6f5ad10c81768337f3a8c11dd0c128f908fd
tree9b93983784ff3cb0e1eb7276ff816377d34b60e2
parent3f7d9a96138656d2fd54b1ea74c58adcee5056b3
parent1f8ea39aca5468191ebb05ad23576f2d1bf43f1c
Merge remote-tracking branch 'mfischer/wget' into next

Conflicts:
make.sh