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

Conflicts:
	make.sh

diff --cc make.sh
index 05be85725dd272183df6e3f07bedaa1cbb893f84,595abd432cf80726fdc771e5c5ab0d9e92bbee3b..b92d47a5d24ce93b9b3a55677ccc77ad7eb92850
--- 1/make.sh
--- 2/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