Merge "Make "/*@noflip*/ /*@embed*/" annotation work without CSSJanus hacks"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Sep 2014 22:57:18 +0000 (22:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Sep 2014 22:57:18 +0000 (22:57 +0000)

Trivial merge