From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 3 Mar 2013 22:11:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/core67-merge' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=5627b4c9f276f480dffd93d264288de4b936bad7

Merge remote-tracking branch 'stevee/core67-merge' into next

Conflicts:
	make.sh
---

5627b4c9f276f480dffd93d264288de4b936bad7
diff --cc make.sh
index fbd377e56,b92d47a5d..e427929dc
--- a/make.sh
+++ b/make.sh
@@@ -754,10 -755,7 +755,11 @@@ buildipfire() 
    ipfiremake libstatgrab
    ipfiremake sarg
    ipfiremake fstrim
 +  ipfiremake check_mk_agent
 +  ipfiremake libdaemon
 +  ipfiremake avahi
 +  ipfiremake nginx
+   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