Arne Fitzenreiter 0fbba54e82 Merge branch 'master' into next ...

Conflicts:
	lfs/monit

2015-04-11 21:58:09 +02:00

..

includes

Remove some left-over files

2015-03-18 15:18:56 +01:00

backup.pl

backup: make include file parsing more robust.

2015-03-06 17:22:18 +01:00

exclude

Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall

2013-10-24 09:24:12 +02:00

include

vpn-statistic: move collectd.vpn to /var/ipfire/ovpn/

2015-04-09 15:16:32 +02:00