Michael Tremer 9063a04e94 Merge branch 'master' into fifteen ...

Conflicts:
	config/backup/backup.pl

2014-01-09 13:31:25 +01:00

..

includes

tor: Configuration file updates.

2013-07-30 21:39:50 +02:00

backup.pl

Merge branch 'master' into fifteen

2014-01-09 13:31:25 +01:00

exclude

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

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

include

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

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