Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-10-14 08:29:18 +02:00
18 changed files with 81 additions and 56 deletions

View File

@@ -160,6 +160,7 @@
* igb-2.3.4-kmod-2.6.32.24-ipfire-xen
* igmpproxy-0.1
* imspector-0.9
* imspector-20101008
* inetutils-1.4.2
* ipaddr-1.2
* iperf-2.0.4
@@ -316,6 +317,7 @@
* rsync-3.0.7
* rtorrent-0.8.6
* samba-3.5.5
* samba-3.5.6
* sane-1.0.19
* screen-4.0.3
* sdparm-1.01
@@ -330,7 +332,7 @@
* spandsp-0.0.6pre12
* splix-2.0.0-rc2
* sqlite-3.6.10
* squid-2.7.STABLE9
* squid-3.1.8
* squidGuard-1.4.1
* squidclamav-5.4
* sshfs-fuse-2.2
@@ -373,6 +375,7 @@
* vnstat-1.6
* vnstati-beta3
* vsftpd-2.1.2
* vsftpd-2.2.2
* w_scan-20080105
* watchdog-5.9
* wget-1.10.2