Commit [bb9cca] Maximize Restore History

Merge branch 'maint' into next

Theodore Ts'o Theodore Ts'o 2014-06-02