Merge "Fixed some @params documentation (includes/*)"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 22 Apr 2014 10:05:49 +0000 (10:05 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 22 Apr 2014 10:05:49 +0000 (10:05 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Apr 2014 10:05:49 +0000 (10:05 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Apr 2014 10:05:49 +0000 (10:05 +0000)
diff --cc includes/resourceloader/ResourceLoaderStartUpModule.php
Simple merge
diff --cc includes/search/SearchPostgres.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 22 Apr 2014 10:05:49 +0000 (10:05 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 22 Apr 2014 10:05:49 +0000 (10:05 +0000)
		1	2
includes/resourceloader/ResourceLoaderStartUpModule.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/search/SearchPostgres.php	patch \|	diff1 \|	diff2 \|	blob \| history