Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2015-12-02 21:39:20 +01:00
11 changed files with 70 additions and 31 deletions

View File

@@ -22,5 +22,6 @@ usr/local/bin/ipsecctrl
usr/local/bin/settime
usr/local/bin/timecheck
var/ipfire/backup/exclude
var/ipfire/dhcpc/dhcpcd.conf
var/ipfire/langs
var/ipfire/network-functions.pl