Commit [24ec6d] Maximize Restore History

Merge branch 'master' into ffmpeg

Justin Maggard Justin Maggard 2014-07-12