Merge "Cleaned up getScopedFileLocks() return value"
authorAaron Schulz <aschulz@wikimedia.org>
Sun, 20 Sep 2015 19:24:48 +0000 (19:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 20 Sep 2015 19:24:48 +0000 (19:24 +0000)

Trivial merge