Merge "[FileBackend] Cleaned up resyncFiles() and added conservative resync option...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 10 May 2013 20:02:00 +0000 (20:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 10 May 2013 20:02:00 +0000 (20:02 +0000)

Trivial merge