Merge remote-tracking branch 'dweismueller/telnet' into next

Conflicts:
	make.sh

diff --cc make.sh
index cf36f63a7839085502dd5d39556900763fde8d4e,57dbd693809b5a5794584516f45d8e7218eee48f..e5d62533d2041fa56712ea2cb9adccac388b9b55
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -769,8 -767,7 +769,9 @@@ buildipfire() 
    ipfiremake lcd4linux
    ipfiremake mtr
    ipfiremake tcpick
 +  ipfiremake minidlna
 +  ipfiremake fping
+   ipfiremake telnet
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild