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

Conflicts:
	config/backup/backup.pl

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

..

75

backup: Convert backups with old CCD files.

2014-01-09 12:31:31 +01:00

fifteen

fifteen: add shutdown.cgi menu entry to updater.

2014-01-08 22:58:50 +01:00