From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 11 Aug 2013 11:33:48 +0000 (+0200)
Subject: Merge remote-tracking branch 'ummeegge/iptraf-ng' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=54cdc7dea2b59ff05bf9e1b4d6308214826fc8a1

Merge remote-tracking branch 'ummeegge/iptraf-ng' into next

Conflicts:
	make.sh
---

54cdc7dea2b59ff05bf9e1b4d6308214826fc8a1
diff --cc make.sh
index 538151ccd,4424e762f..50a58782d
--- a/make.sh
+++ b/make.sh
@@@ -780,9 -779,7 +780,10 @@@ buildipfire() 
    ipfiremake perl-File-Tail
    ipfiremake perl-TimeDate
    ipfiremake swatch
 +  ipfiremake tor
 +  ipfiremake arm
 +  ipfiremake wavemon
+   ipfiremake iptraf-ng
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild