Increase time limits for the reindex
Merge pull request #337 from magopian/increase-time-limits-for-reindex

Increase time limits for the reindex
Bug 1084552: Display non-deleted parent directories of deleted files in diff viewer.
Merge pull request #338 from kmaglione/file-viewer-fixes

Bug 1084552: Display non-deleted parent direcotries of deleted files in diff viewer