Merge "$wgUseSquid unused since parent commit (fa1a8d5)"
authorAaron Schulz <aschulz@wikimedia.org>
Mon, 28 May 2012 22:36:38 +0000 (22:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 28 May 2012 22:36:38 +0000 (22:36 +0000)
1  2 
includes/filerepo/file/LocalFile.php

Simple merge