Merge "Removed __NOHEADER__ magic word"
authorSiebrand <siebrand@wikimedia.org>
Tue, 2 Oct 2012 08:46:42 +0000 (08:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 2 Oct 2012 08:46:42 +0000 (08:46 +0000)

Trivial merge