Merge "Remove empty line comments"

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

Wed, 14 Oct 2015 08:27:40 +0000 (08:27 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 14 Oct 2015 08:27:40 +0000 (08:27 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 14 Oct 2015 08:27:40 +0000 (08:27 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 14 Oct 2015 08:27:40 +0000 (08:27 +0000)
diff --cc includes/User.php
Simple merge
diff --cc tests/phpunit/MediaWikiTestCase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 14 Oct 2015 08:27:40 +0000 (08:27 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 14 Oct 2015 08:27:40 +0000 (08:27 +0000)
		1	2
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/MediaWikiTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history