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

This commit is contained in:
Michael Tremer
2013-07-17 17:45:40 +02:00
4 changed files with 6 additions and 2 deletions

View File

@@ -30,6 +30,8 @@ var/ipfire/dmzholes
#var/ipfire/dmzholes/config
var/ipfire/dns
#var/ipfire/dns/settings
var/ipfire/dnsforward
#var/ipfire/dnsforward/config
var/ipfire/ethernet
#var/ipfire/ethernet/aliases
#var/ipfire/ethernet/known_nics