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)
Conflicts:
make.sh


Trivial merge