Commit [3dd145] Maximize Restore History

Merge branch 'local'

Conflicts:
Allura/allura/tests/test_tasks.py

Peter Hartmann Peter Hartmann 2012-10-02