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

This commit is contained in:
Arne Fitzenreiter
2013-05-16 15:47:58 +02:00
12 changed files with 13 additions and 18 deletions

View File

@@ -2,6 +2,7 @@ etc/system-release
etc/issue
etc/modprobe.d/blacklist
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi