Merge remote-tracking branch 'origin/next' into fifteen

This commit is contained in:
Arne Fitzenreiter
2013-12-21 10:05:39 +01:00
7 changed files with 7 additions and 15 deletions

View File

@@ -155,6 +155,7 @@ var/ipfire/proxy
#var/ipfire/proxy/calamaris
#var/ipfire/proxy/calamaris/bin
#var/ipfire/proxy/settings
#var/ipfire/proxy/squid.conf
var/ipfire/qos
#var/ipfire/qos/bin
#var/ipfire/qos/bin/RRD-func.pl

View File

@@ -1,2 +1 @@
usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-rdrand.so

View File

@@ -2,5 +2,6 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/dnsforward.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/httpscert
var/ipfire/header.pl
var/ipfire/langs