Merge "Disable external entities in Import"
authorcsteipp <csteipp@wikimedia.org>
Mon, 15 Apr 2013 20:56:14 +0000 (20:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 15 Apr 2013 20:56:14 +0000 (20:56 +0000)

Trivial merge