Merge branch 'master' into next

Conflicts:
	lfs/monit
This commit is contained in:
Arne Fitzenreiter
2015-04-11 21:58:09 +02:00
20 changed files with 240 additions and 116 deletions

View File

@@ -4,6 +4,7 @@
/var/ipfire/*/config
/var/ipfire/*/enable
/var/ipfire/*/*enable*
/var/ipfire/ovpn/collectd.vpn
/etc/passwd
/etc/shadow
/etc/group