From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 17 Sep 2012 17:10:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'dweismueller/telnet' into next
X-Git-Tag: v2.11-core63~1^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26c8b40955b104d7d747d4a965f7ab4178dcae3b;p=ipfire-2.x.git

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

Conflicts:
	make.sh
---

26c8b40955b104d7d747d4a965f7ab4178dcae3b
diff --cc make.sh
index cf36f63a78,57dbd69380..e5d62533d2
--- a/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