Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/filelists/files
	make.sh
This commit is contained in:
Arne Fitzenreiter
2010-08-29 12:59:53 +02:00
28 changed files with 853 additions and 18 deletions

View File

@@ -149,6 +149,7 @@
* icegenerator-0.5.5-pre2
* iftop-0.17
* igmpproxy-0.1
* imspector-0.9
* inetutils-1.4.2
* ipaddr-1.2
* iperf-2.0.4
@@ -313,7 +314,7 @@
* squashfs-lzma-cvs20100214
* squid-2.7.STABLE9
* squidGuard-1.4.1
* squidclamav-5.3
* squidclamav-5.4
* sshfs-fuse-2.2
* sslh-1.7a
* streamripper-1.63.5