Thomas Müller 6d4764d6c4 Merge branch 'stable6' into fixing-stable6 ... Conflicts: admin_manual/configuration/custom_mount_config_gui.rst admin_manual/maintenance/backup.rst admin_manual/maintenance/restore.rst		2013-11-25 10:13:55 +01:00
..
backup.rst	Merge branch 'stable6' into fixing-stable6	2013-11-25 10:13:55 +01:00
index.rst	restore.rst added	2013-11-15 15:29:57 +01:00
migrating.rst	Update migrating.rst	2013-11-15 15:36:51 +01:00
restore.rst	Merge branch 'stable6' into fixing-stable6	2013-11-25 10:13:55 +01:00
update.rst	fixing typos and spelling + respect max characters of 80	2013-11-25 09:26:46 +01:00