Commit [987e5d] Maximize Restore History

Merge mozilla-central and inbound

Ed Morley Ed Morley 2013-06-21