From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 5 Mar 2015 18:48:52 +0000 (+0100)
Subject: Merge branch 'seventeen-geoip' into next-guardian-geoip
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=153f390ae911e67c8cb39a704fbaf298487b6ee2;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'seventeen-geoip' into next-guardian-geoip
---

153f390ae911e67c8cb39a704fbaf298487b6ee2
diff --cc make.sh
index 38fc846f25,9f77df59be..0495222ad1
--- a/make.sh
+++ b/make.sh
@@@ -810,10 -815,8 +816,11 @@@ buildipfire() 
    ipfiremake squid-accounting
    ipfiremake pigz
    ipfiremake tmux
+   ipfiremake perl-Text-CSV_XS
    ipfiremake swconfig
 +  ipfiremake haproxy
 +  ipfiremake perl-common-sense
 +  ipfiremake perl-inotify2
  }
  
  buildinstaller() {