From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 3 Mar 2013 12:42:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'erik/sendEmail' into core67-merge
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=2795e579303e847e245204fe48141444a66a9235

Merge remote-tracking branch 'erik/sendEmail' into core67-merge

Conflicts:
	make.sh
---

2795e579303e847e245204fe48141444a66a9235
diff --cc make.sh
index 05be85725,595abd432..b92d47a5d
--- a/make.sh
+++ b/make.sh
@@@ -753,7 -776,7 +754,8 @@@ buildipfire() 
    ipfiremake stress
    ipfiremake libstatgrab
    ipfiremake sarg
 +  ipfiremake fstrim
+   ipfiremake sendEmail
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild