Merge "Show user names as subpages of special pages in autocomplete search"

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

Wed, 30 Dec 2015 00:16:20 +0000 (00:16 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 30 Dec 2015 00:16:20 +0000 (00:16 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Dec 2015 00:16:20 +0000 (00:16 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Dec 2015 00:16:20 +0000 (00:16 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/db/Database.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 30 Dec 2015 00:16:20 +0000 (00:16 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 30 Dec 2015 00:16:20 +0000 (00:16 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/Database.php	patch \|	diff1 \|	diff2 \|	blob \| history