Merge "Avoid calling protected File field"
authorBrian Wolff <bawolff+wn@gmail.com>
Thu, 12 Dec 2013 18:51:57 +0000 (18:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 12 Dec 2013 18:51:57 +0000 (18:51 +0000)

Trivial merge