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

This commit is contained in:
Dirk Wagner
2014-06-14 09:41:59 +02:00
101 changed files with 13688 additions and 1075 deletions

View File

@@ -34,7 +34,6 @@ etc/rc.d/init.d/functions
#etc/rc.d/init.d/gnump3d
etc/rc.d/init.d/halt
#etc/rc.d/init.d/hostapd
#etc/rc.d/init.d/icecream
#etc/rc.d/init.d/imspector
etc/rc.d/init.d/ipsec
#etc/rc.d/init.d/keepalived