Merge "Bug 35671 - PHP Notice: Undefined index: gettoken in includes/api/ApiMain...
authorDemon <chadh@wikimedia.org>
Tue, 3 Apr 2012 19:47:08 +0000 (19:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Apr 2012 19:47:08 +0000 (19:47 +0000)

Trivial merge