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

This commit is contained in:
Arne Fitzenreiter
2012-07-10 13:26:45 +02:00
5 changed files with 20 additions and 2 deletions

View File

@@ -1,6 +1,7 @@
etc/system-release
etc/issue
etc/rc.d/init.d/collectd
opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi