From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Fri, 13 Jun 2008 15:14:55 +0000 (+0200)
Subject: Merge branch 'rspezial'
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=13704e5b1c27dee12c68daf48adb663f12b6f14d

Merge branch 'rspezial'

Conflicts:

	config/rootfiles/core/15/files
	config/rootfiles/core/15/update.sh
	lfs/collectd
	make.sh
---

13704e5b1c27dee12c68daf48adb663f12b6f14d
diff --cc make.sh
index 9206c07c4,ae02a2df4..04a348c05
--- a/make.sh
+++ b/make.sh
@@@ -574,8 -578,11 +578,11 @@@ buildipfire() 
    ipfiremake squidclamav
    ipfiremake bc
    ipfiremake esniper
 +  ipfiremake mod_perl
- }
+   ipfiremake vnstat
+   ipfiremake vnstati
+   ipfiremake wpa_supplicant
 -  ipfiremake hostapd
 -}
++  ipfiremake hostapd}
  
  buildinstaller() {
    # Run installer scripts one by one