Added back local tabs for edit, delete, export. Admin menu users are just going to have to deal with it
Fixed dependency issue for timestamp
#827396  Added revert message instead of delete.

Fixed issue where user 0 (anon) was getting a an id > 0 upon restore

Made sure we're only running cron schedules if they've been set to use built in scheduling

Conflicts:
	README.txt

Switched 'source-like-destinations' to 'sources'. Moved scheduled up to top level. Various bug fixes from the 2.x branch

Added source type to metadata

Disabled backup migrate files if enabled
Eliminated multiple checks for local directories
Added link to update.php screen

#1069282 by imonemus Filenames "append timestamp" corruption with multiple schedules per cron run (using one profile)

#1042862 thanks joshuajabbour. When appending a timestamp to filename, don't add hyphen if no base filename

Conflicts:

	includes/files.inc

#973776 by wonder95. Default value for $profile defined as array in backup_migrate_ui_manual_backup_form(), should be object

Conflicts:

	backup_migrate.install

Added admin block for quick backups

#394234 Renamed bz to bz2
Removed 'experimental' label from encryption
Consolidated import to 1 screen

Issue #598636 by roderik, rfay PHP 5.3 and date error

Issue #598636 by roderik, rfay PHP 5.3 and date error

Added backup and migrate files functionality and altered destination loading so that two conflicting destinations won't cause a fatal errlr

Added cli gzip. Allowing for temp directories. Moved pre/post backup filtering to work despite backup engine.

Fixed whitescreen on restore

Added .info files to backups with basic metadata (including descriptions)