Merge "Make "/*@noflip*/ /*@embed*/" annotation work"

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

Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
diff --cc includes/OutputPage.php
Simple merge
diff --cc includes/resourceloader/ResourceLoaderFileModule.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 29 Aug 2014 19:45:06 +0000 (19:45 +0000)
		1	2
includes/OutputPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/resourceloader/ResourceLoaderFileModule.php	patch \|	diff1 \|	diff2 \|	blob \| history