Commit [cd1b67] Maximize Restore History

Merge b2g-inbound to m-c. a=merge

Ryan VanderMeulen Ryan VanderMeulen 2014-08-08