2009-03-21 - production
00:03	<brion>	live-merging r48648 to allow $wgHTTPProxy to work for uploads and not interfere with search	[production]